summary refs log tree commit diff
diff options
context:
space:
mode:
authorLaurent Bigonville <bigon@bigon.be>2013-12-27 14:17:03 +0100
committerLaurent Bigonville <bigon@bigon.be>2013-12-27 14:17:03 +0100
commit696f481ba515b29d917325c87aab5d803461e243 (patch)
tree2d79a8bb5b3a2b29d4b2f79f893ee5aac7af25c4
parent7ea5e704716406ecab06470a0cc1a958d0823b15 (diff)
Completely Drop debian/patches/03-systemd.patch: /usr should now be mounted from the initramfs meaning that it will be available early enough
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/03-systemd.patch14
-rw-r--r--debian/patches/series1
3 files changed, 3 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index 9dd10743..260d73b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ network-manager (0.9.8.8-2) UNRELEASED; urgency=medium
     symlink instead of using an Alias= to mask the initscript (Closes: #719703)
   * debian/control, debian/rules: Add call to dh-systemd to enable and start
     the systemd services (Closes: #730437)
+  * Completely Drop debian/patches/03-systemd.patch: /usr should now be
+    mounted from the initramfs meaning that it will be available early enough
 
- -- Laurent Bigonville <bigon@debian.org>  Mon, 09 Dec 2013 21:06:52 +0100
+ -- Laurent Bigonville <bigon@debian.org>  Fri, 27 Dec 2013 14:15:45 +0100
 
 network-manager (0.9.8.8-1) experimental; urgency=low
 
diff --git a/debian/patches/03-systemd.patch b/debian/patches/03-systemd.patch
deleted file mode 100644
index 2597d698..00000000
--- a/debian/patches/03-systemd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
diff --git a/debian/patches/series b/debian/patches/series
index 1eef0c6e..e34ad442 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 02-dbus_access_network_manager.patch
-03-systemd.patch
 05-force-online-with-unmanaged-devices.patch