diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/network-manager.links | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 16e64c0c..7d14b6ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,10 @@ network-manager (0.9.8.8-2) experimental; urgency=medium * debian/network-manager.links: Create a symlink so NetworkManager-wait-online.service is run before network-online.target * debian/control: Bump Standards-Version to 3.9.5 (no further changes) + * debian/network-manager.links, debian/rules: Create the symlinks before + calling dh_systemd_start so the services are not restarted twice - -- Laurent Bigonville <bigon@debian.org> Fri, 27 Dec 2013 15:16:19 +0100 + -- Laurent Bigonville <bigon@debian.org> Fri, 27 Dec 2013 15:46:33 +0100 network-manager (0.9.8.8-1) experimental; urgency=low diff --git a/debian/network-manager.links b/debian/network-manager.links deleted file mode 100644 index 11308c6f..00000000 --- a/debian/network-manager.links +++ /dev/null @@ -1,2 +0,0 @@ -lib/systemd/system/NetworkManager.service lib/systemd/system/network-manager.service -lib/systemd/system/NetworkManager-wait-online.service lib/systemd/system/network-online.target.wants/NetworkManager-wait-online.service diff --git a/debian/rules b/debian/rules index 43545188..c0335c49 100755 --- a/debian/rules +++ b/debian/rules @@ -58,6 +58,10 @@ override_dh_systemd_enable: dh_systemd_enable -pnetwork-manager NetworkManager.service 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 |