about summary refs log tree commit diff
path: root/debian/patches/03-systemd.patch
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@luon.net>2013-10-25 21:28:12 +0200
committerSjoerd Simons <sjoerd@luon.net>2013-10-25 21:29:44 +0200
commit1005ae9164278136b3b0a5e8a4a4d3ea2d334a6d (patch)
treeda986473a200c84318df59b727784ca92b583a9e /debian/patches/03-systemd.patch
parent040c063d5ebdbf598fa680d29f1585440e343b70 (diff)
Update patches
* Dropped patches fixed upstream:
  + d/p/06-tear-down-connections-for-unavailable-devices.patch
  + d/p/07-duid-fallback.patch
  + d/p/08-ifupdown-clarify-name-of-connections-hash.patch
  + d/p/09-ifupdown-fix-naming-confusion-in-plugin-hash-tables.patch
  + d/p/10-ifupdown-recalculate-unmanaged-specs-on-interface-ch.patch
* debian/patches/03-systemd.patch: Refreshed
* debian/patches/05-force-online-with-unmanaged-devices.patch: Refreshes
Diffstat (limited to 'debian/patches/03-systemd.patch')
-rw-r--r--debian/patches/03-systemd.patch15
1 files changed, 6 insertions, 9 deletions
diff --git a/debian/patches/03-systemd.patch b/debian/patches/03-systemd.patch
index ed1da53d..7d3d3d9d 100644
--- a/debian/patches/03-systemd.patch
+++ b/debian/patches/03-systemd.patch
@@ -4,23 +4,20 @@ 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>
-Index: network-manager/data/NetworkManager.service.in
-===================================================================
---- network-manager.orig/data/NetworkManager.service.in	2013-01-29 20:14:47.671547402 +0100
-+++ network-manager/data/NetworkManager.service.in	2013-01-29 20:15:03.927722604 +0100
-@@ -1,8 +1,6 @@
+--- a/data/NetworkManager.service.in
++++ b/data/NetworkManager.service.in
+@@ -1,7 +1,5 @@
  [Unit]
  Description=Network Manager
- After=syslog.target
 -Wants=network.target
 -Before=network.target
  
  [Service]
  Type=dbus
-@@ -18,5 +16,6 @@
+@@ -17,5 +15,5 @@
  [Install]
  WantedBy=multi-user.target
  Alias=dbus-org.freedesktop.NetworkManager.service
 +Alias=network-manager.service
- Also=NetworkManager-wait-online.service
- 
+ Also=NetworkManager-dispatcher.service
+-