From 1005ae9164278136b3b0a5e8a4a4d3ea2d334a6d Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Fri, 25 Oct 2013 21:28:12 +0200 Subject: 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 --- debian/patches/03-systemd.patch | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'debian/patches/03-systemd.patch') 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 -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 +- -- cgit 1.3.0-6-gf8a5