about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-06-02 18:47:08 +0200
committerMichael Biebl <biebl@debian.org>2016-06-02 19:00:22 +0200
commit68c1a79b2687b9ecbd82f67b5d42fc75876be753 (patch)
tree8f8d7b823e3711da3f4af866c74d1cfe18d5f506 /debian
parentfc3f97d61cb0727ed4aaa70551b2c8298aa621ff (diff)
Make sure NetworkManager-wait-online.service is enabled on upgrades
We need to purge the old state, otherwise i-s-h won't enable the
service on upgrades.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/network-manager.preinst5
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a69be41d..feff512d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ network-manager (1.2.2-2) UNRELEASED; urgency=medium
     network file systems works properly and SysV init scripts depending on
     $network will be delayed until network is available (or a timeout is
     reached).
+  * Make sure NetworkManager-wait-online.service is enabled on upgrades. We
+    need to purge the old state, otherwise i-s-h won't enable the service on
+    upgrades.
 
  -- Michael Biebl <biebl@debian.org>  Thu, 02 Jun 2016 18:17:28 +0200
 
diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst
index 37b564ca..9fff61dc 100644
--- a/debian/network-manager.preinst
+++ b/debian/network-manager.preinst
@@ -40,6 +40,11 @@ case "$1" in
 	        mv -n /var/run/NetworkManager.pid /var/run/NetworkManager/
 	    fi
 	fi
+
+	# Purge the state so the service gets properly enabled on upgrades
+	if dpkg --compare-versions "$2" lt "1.2.2-2"; then
+	    deb-systemd-helper purge NetworkManager-wait-online.service
+	fi
 	;;
 
     abort-upgrade)