From f5643a53ea4914df91fd550126335312cfae9e56 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 4 May 2011 22:28:36 +0200 Subject: Refresh debian/patches/03-systemd.patch. --- debian/changelog | 1 + debian/patches/03-systemd.patch | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2537fab7..56b956d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ network-manager (0.8.999-1) UNRELEASED; urgency=low * New upstream release (0.9 rc2). + * Refresh debian/patches/03-systemd.patch. -- Michael Biebl Wed, 04 May 2011 21:36:00 +0200 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 -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 -- cgit 1.3.0-6-gf8a5