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.

1 files changed, 14 insertions, 0 deletions

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