about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-10-16 22:00:18 +0200
committerMichael Biebl <biebl@debian.org>2016-10-16 22:00:18 +0200
commitfe519fa6f051904138103d1f24bed5c8692a61a3 (patch)
treee016a22389c54597424e3e7e444d279accb20e1c
parent2141c1a843fab30caf8349c989626c27d6451318 (diff)
restart-after-upgrade is the default behaviour of dh compat 10
-rwxr-xr-xdebian/rules9
1 files changed, 3 insertions, 6 deletions
diff --git a/debian/rules b/debian/rules
index b9d83834..cba3c53f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,9 +55,6 @@ override_dh_install:
 	install -m 755 debian/ifblacklist_migrate.sh \
 		debian/network-manager/usr/lib/NetworkManager
 
-override_dh_installinit:
-	dh_installinit -pnetwork-manager --restart-after-upgrade
-
 override_dh_makeshlibs:
 	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/
 
@@ -67,9 +64,9 @@ override_dh_strip:
 override_dh_systemd_start:
 	dh_link lib/systemd/system/NetworkManager.service \
 		lib/systemd/system/network-manager.service
-	dh_systemd_start -pnetwork-manager --no-start NetworkManager-dispatcher.service
-	dh_systemd_start -pnetwork-manager --no-start NetworkManager-wait-online.service
-	dh_systemd_start -pnetwork-manager --restart-after-upgrade NetworkManager.service
+	dh_systemd_start -pnetwork-manager --no-restart-after-upgrade --no-start NetworkManager-dispatcher.service
+	dh_systemd_start -pnetwork-manager --no-restart-after-upgrade --no-start NetworkManager-wait-online.service
+	dh_systemd_start -pnetwork-manager NetworkManager.service
 
 override_dh_ppp:
 	dh_ppp --breaks