Make lxcfs.service reloadable, reload in postinst

Also don't restart on upgrades

diff --git a/debian/lxcfs.postinst b/debian/lxcfs.postinst
new file mode 100644 (file)
index 0000000..42dd1ec
--- /dev/null
+++ b/debian/lxcfs.postinst
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+  configure)
+    # Check for reload support in lxcfs
+    if [ -n "$2" ] && dpkg --compare-versions "$2" ge 2.0.0-pve1; then
+      # Check for running lxfs
+      if [ -f /run/lxcfs.pid ]; then
+        kill -USR1 `cat /run/lxcfs.pid`
+      fi
+    fi
+  ;;
+
+esac
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/lxcfs.service b/debian/lxcfs.service
index c0f29986148a2e6b333a177a2a8d076487f8e277..8c2f600d3a13ce3368fa6baf0e58ced8429d0e05 100644 (file)
--- a/debian/lxcfs.service
+++ b/debian/lxcfs.service
@@ -5,9 +5,10 @@ Before=lxc.service
 
 [Service]
 ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
-KillMode=none
+KillMode=process
 Restart=on-failure
-ExecStop=/bin/fusermount -u /var/lib/lxcfs
+ExecReload=/bin/kill -USR1 $MAINPID
+ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
 
 [Install]
 WantedBy=multi-user.target

diff --git a/debian/rules b/debian/rules
index de2fd6e29b624dc9fe3b611a78d3d391ac5b1626..6911ba94e2ab520a5a13799a74653ee10e34162d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,3 +11,9 @@ override_dh_strip:
 
 override_dh_auto_install:
        dh_auto_install --destdir=debian/lxcfs
+
+override_dh_installinit:
+       dh_installinit -p lxcfs --no-restart-on-upgrade
+
+override_dh_systemd_start:
+       dh_systemd_start -p lxcfs --no-restart-on-upgrade lxcfs.service