about summary refs log tree commit diff
path: root/debian/patches/03-systemd.patch
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-05-04 22:28:36 +0200
committerMichael Biebl <biebl@debian.org>2011-05-04 22:28:36 +0200
commitf5643a53ea4914df91fd550126335312cfae9e56 (patch)
tree02c7c12a3b9cd8507f06d66c282f5751ea6bdc7d /debian/patches/03-systemd.patch
parent91186fd47bfc1aeec3c836e07e15f3515493bd77 (diff)
Refresh debian/patches/03-systemd.patch.
Diffstat (limited to 'debian/patches/03-systemd.patch')
-rw-r--r--debian/patches/03-systemd.patch22
1 files changed, 14 insertions, 8 deletions
diff --git a/debian/patches/03-systemd.patch b/debian/patches/03-systemd.patch
index e54abc3d..8d1af50d 100644
--- a/debian/patches/03-systemd.patch
+++ b/debian/patches/03-systemd.patch
@@ -4,15 +4,21 @@ 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>
-diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
-index d93fc67..5604729 100644
---- a/data/NetworkManager.service.in
-+++ b/data/NetworkManager.service.in
-@@ -8,5 +8,6 @@ BusName=org.freedesktop.NetworkManager
- ExecStart=@sbindir@/NetworkManager --no-daemon
+Index: network-manager/data/NetworkManager.service.in
+===================================================================
+--- network-manager.orig/data/NetworkManager.service.in	2011-05-04 21:35:57.000000000 +0200
++++ network-manager/data/NetworkManager.service.in	2011-05-04 22:27:37.411911227 +0200
+@@ -1,8 +1,6 @@
+ [Unit]
+ Description=Network Manager
+ After=syslog.target
+-Wants=network.target
+-Before=network.target
  
+ [Service]
+ Type=dbus
+@@ -12,3 +10,4 @@
  [Install]
--WantedBy=network.target multi-user.target
-+WantedBy=multi-user.target
+ WantedBy=multi-user.target
  Alias=dbus-org.freedesktop.NetworkManager.service
 +Alias=network-manager.service