From: Tollef Fog Heen <tfheen@err.no>
Date: Tue, 3 Apr 2012 17:59:14 +0000 (+0200)
Subject: Always restart the initctl socket on upgrades, to mask sysvinit removing it.
X-Git-Tag: 44-1~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41060f5ad5690d22c0df7f4991084ac4a69ca448;p=systemd

Always restart the initctl socket on upgrades, to mask sysvinit removing it.
---

diff --git a/debian/changelog b/debian/changelog
index bf17046b..89f2e274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ systemd (44-1) UNRELEASED; urgency=low
   * Explicitly order debian-fixup before sysinit.target to prevent a
     possible race condition with the creation of sockets.  Thanks to
     Michael Biebl for debugging this.
+  * Always restart the initctl socket on upgrades, to mask sysvinit
+    removing it.
 
   [ Michael Biebl ]
   * Remove workaround for non-interactive sessions from pam config again.
diff --git a/debian/systemd.postinst b/debian/systemd.postinst
index 97ff835f..366f7f54 100644
--- a/debian/systemd.postinst
+++ b/debian/systemd.postinst
@@ -40,11 +40,9 @@ EOF
     fi
 fi
 
-if dpkg --compare-versions "$2" lt "37-1.1"; then
-    # Create /run/initctl → /dev/initctl compat symlink on upgrades
-    if [ -e /sys/fs/cgroup/systemd ]; then
-        _systemctl restart systemd-initctl.socket || true
-    fi
+# Create /run/initctl → /dev/initctl compat symlink on upgrades
+if [ -e /sys/fs/cgroup/systemd ]; then
+    _systemctl restart systemd-initctl.socket || true
 fi
 
 if dpkg --compare-versions "$2" lt "40-1"; then