diff options
| author | Laurent Bigonville <bigon@bigon.be> | 2013-12-09 21:35:11 +0100 |
|---|---|---|
| committer | Laurent Bigonville <bigon@bigon.be> | 2013-12-27 02:19:19 +0100 |
| commit | 7ea5e704716406ecab06470a0cc1a958d0823b15 (patch) | |
| tree | 27cbc96cb922e914be50aed8ae8eb0032882842e | |
| parent | 96649d112bc12b737ace509d790eef0b289b3716 (diff) | |
debian/control, debian/rules: Add call to dh-systemd to enable and start the systemd services (Closes: #730437)
Do not enable or start NetworkManager-wait-online.service by default, do not start NetworkManager-dispatcher.service and only restart NetworkManager.service after upgrade
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | debian/rules | 12 |
3 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 085848e6..9dd10743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ network-manager (0.9.8.8-2) UNRELEASED; urgency=medium NetworkManager-dispatcher.service service file * debian/patches/03-systemd.patch, debian/network-manager.links: Install a symlink instead of using an Alias= to mask the initscript (Closes: #719703) + * debian/control, debian/rules: Add call to dh-systemd to enable and start + the systemd services (Closes: #730437) - -- Laurent Bigonville <bigon@debian.org> Mon, 09 Dec 2013 19:23:40 +0100 + -- Laurent Bigonville <bigon@debian.org> Mon, 09 Dec 2013 21:06:52 +0100 network-manager (0.9.8.8-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 03665291..95419824 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org> Build-Depends: debhelper (>= 8.1.0), dpkg-dev (>= 1.16.1), + dh-systemd (>= 1.14), autotools-dev, pkg-config, intltool, diff --git a/debian/rules b/debian/rules index 581828ba..43545188 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ endif %: - dh $@ --with gir + dh $@ --with gir,systemd override_dh_auto_configure: dh_auto_configure -- \ @@ -52,4 +52,14 @@ override_dh_strip: override_dh_builddeb: dh_builddeb -- -Zxz +override_dh_systemd_enable: + dh_systemd_enable -pnetwork-manager NetworkManager-dispatcher.service + dh_systemd_enable -pnetwork-manager --no-enable NetworkManager-wait-online.service + dh_systemd_enable -pnetwork-manager NetworkManager.service + +override_dh_systemd_start: + 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 + override_dh_auto_test: |