about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rwxr-xr-xdebian/rules2
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 424815ab..785db469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+network-manager (0.9.8.10-2) UNRELEASED; urgency=medium
+
+  * Don't hookup NetworkManager-wait-online.service in network-online.target
+    because it creates a dependency cycle with our current support for legacy
+    SysV init scripts.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 27 Apr 2014 00:35:00 +0200
+
 network-manager (0.9.8.10-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 512eda65..53fe18e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,8 +62,6 @@ override_dh_systemd_enable:
 override_dh_systemd_start:
 	dh_link lib/systemd/system/NetworkManager.service \
 		lib/systemd/system/network-manager.service
-	dh_link lib/systemd/system/NetworkManager-wait-online.service \
-		lib/systemd/system/network-online.target.wants/NetworkManager-wait-online.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