diff options
| author | Michael Biebl <biebl@debian.org> | 2014-03-28 13:36:27 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-03-28 13:49:43 +0100 |
| commit | 4689c8081228091bab4714ee0af2e2ce015596c2 (patch) | |
| tree | 682f7287ee0fd723bb0b3e72b54d11342458479f | |
| parent | d9c3ec804047eaea882466721b6557afbfe9d010 (diff) | |
Revert "Completely Drop debian/patches/03-systemd.patch: /usr should now be mounted from the initramfs meaning that it will be available early enough"
This reverts commit 696f481ba515b29d917325c87aab5d803461e243. This patch is needed to avoid a dependency loop which is generated by early boot (rcS) SysV init scripts depending on the $network LSB system facility (either directly or indirectly via $remote_fs). The $network LSB system facility is mapped to network.target. Those rcS SysV init scripts are started in sysinit.target, NetworkManager.service is started via multi-user.target, which depends on sysinit.target. As long as we have rcS SysV init scripts which such a dependency on $remote_fs or $network we can not make NetworkManager.service a provider for network.target.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/03-systemd.patch | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 00c5dcbf..c3624532 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,8 +26,6 @@ network-manager (0.9.8.8-2) experimental; urgency=medium 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 - * Completely Drop debian/patches/03-systemd.patch: /usr should now be - mounted from the initramfs meaning that it will be available early enough * 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) diff --git a/debian/patches/03-systemd.patch b/debian/patches/03-systemd.patch new file mode 100644 index 00000000..2597d698 --- /dev/null +++ b/debian/patches/03-systemd.patch @@ -0,0 +1,14 @@ +Description: Debian specific tweaks for NetworkManager systemd service file + - Do not install NetworkManager into the network.target, as this will lead to a + dependency loop (NetworkManager is installed in /usr). +Author: Michael Biebl <biebl@debian.org> +--- a/data/NetworkManager.service.in ++++ b/data/NetworkManager.service.in +@@ -1,7 +1,5 @@ + [Unit] + Description=Network Manager +-Wants=network.target +-Before=network.target + + [Service] + Type=dbus diff --git a/debian/patches/series b/debian/patches/series index e34ad442..1eef0c6e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 02-dbus_access_network_manager.patch +03-systemd.patch 05-force-online-with-unmanaged-devices.patch |