bump version to 4.0.1-pve1

and kill systemd debhelpers, they cannot reload properly at
all

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/debian/changelog b/debian/changelog
index 7fc8571d2cbd01c1128b05aaed0d9ca4e3fe364e..2a4f052f977f5c1d72de2d58b8fd7101c6da636d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lxcfs (4.0.1-pve1) pve; urgency=medium
+
+  * update to lxcfs-4.0.1
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 17 Mar 2020 14:51:52 +0100
+
 lxcfs (4.0.0-pve1) pve; urgency=medium
 
   * update to lxcfs-4.0.0

diff --git a/debian/compat b/debian/compat
index f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2..48082f72f087ce7e6fa75b9c41d7387daecd447b 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+12

diff --git a/debian/lxcfs.postinst b/debian/lxcfs.postinst
index da23c8732145920e25463e3f04b9c4738cdf4a20..4253b2459ad199a2b467bfeb7b8c7cfa68634da5 100644 (file)
--- a/debian/lxcfs.postinst
+++ b/debian/lxcfs.postinst
@@ -18,6 +18,24 @@ case "$1" in
 
 esac
 
-#DEBHELPER#
+# Copied from dh_installsystemd/12.1.1
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
+       # This will only remove masks created by d-s-h on package removal.
+       deb-systemd-helper unmask 'lxcfs.service' >/dev/null || true
+
+       # was-enabled defaults to true, so new installations run enable.
+       if deb-systemd-helper --quiet was-enabled 'lxcfs.service'; then
+               # Enables the unit on first installation, creates new
+               # symlinks on upgrades if the unit file has changed.
+               deb-systemd-helper enable 'lxcfs.service' >/dev/null || true
+       else
+               # Update the statefile to add new symlinks (if any), which need to be
+               # cleaned up on purge. Also remove old symlinks.
+               deb-systemd-helper update-state 'lxcfs.service' >/dev/null || true
+       fi
+fi
+
+# dh_installsystemd cannot do a reload, you can only choose between stop-start,
+# restart and try-restart. NONE of which are acceptable!
 
 exit 0

diff --git a/debian/rules b/debian/rules
index 98d08c0c82dc62e86287cdc73beb986df2b53f03..e8fef3a848e4bcf4d9c89a7ba8d5fc1cf08b2927 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-       dh $@  --with autoreconf,systemd,quilt
+       dh $@  --with autoreconf,quilt
 
 override_dh_install:
        find $(CURDIR)/debian/lxcfs/lib/ -type d -empty -delete
@@ -17,8 +17,8 @@ override_dh_auto_configure:
 override_dh_auto_install:
        dh_auto_install --destdir=debian/lxcfs
 
-override_dh_installinit:
-       dh_installsystemd -p lxcfs --no-restart-on-upgrade
+override_dh_installsystemd:
+       # just fuck off
 
 override_dh_systemd_start:
-       dh_systemd_start -p lxcfs --no-restart-on-upgrade lxcfs.service
+       dh_systemd_start -p lxcfs --no-stop-on-upgrade lxcfs.service

diff --git a/lxcfs b/lxcfs
index 6df0f969ee8a73ebae8f58acb91404cfb8c9cc14..2df8b9f9b20fb9dd76f8ca8d77eadf3458f25b5b 160000 (submodule)
--- a/lxcfs
+++ b/lxcfs
@@ -1 +1 @@
-Subproject commit 6df0f969ee8a73ebae8f58acb91404cfb8c9cc14
+Subproject commit 2df8b9f9b20fb9dd76f8ca8d77eadf3458f25b5b