about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLaurent Bigonville <bigon@bigon.be>2013-12-09 19:24:33 +0100
committerLaurent Bigonville <bigon@bigon.be>2013-12-09 20:13:19 +0100
commit96649d112bc12b737ace509d790eef0b289b3716 (patch)
treebd289198bef5517aa42467c37077962eafa3bf0d
parent4f5bce36fa1480b213c770fd4cdcbb35bb954b22 (diff)
debian/patches/03-systemd.patch, debian/network-manager.links: Install a symlink instead of using an Alias= to mask the initscript (Closes: #719703)
-rw-r--r--debian/changelog4
-rw-r--r--debian/network-manager.links1
-rw-r--r--debian/patches/03-systemd.patch9
3 files changed, 4 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index 47f1c81a..085848e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ network-manager (0.9.8.8-2) UNRELEASED; urgency=medium
 
   * debian/network-manager.install: Also install the
     NetworkManager-dispatcher.service service file
+  * debian/patches/03-systemd.patch, debian/network-manager.links: Install a
+    symlink instead of using an Alias= to mask the initscript (Closes: #719703)
 
- -- Laurent Bigonville <bigon@debian.org>  Mon, 09 Dec 2013 15:09:06 +0100
+ -- Laurent Bigonville <bigon@debian.org>  Mon, 09 Dec 2013 19:23:40 +0100
 
 network-manager (0.9.8.8-1) experimental; urgency=low
 
diff --git a/debian/network-manager.links b/debian/network-manager.links
new file mode 100644
index 00000000..d32ad80e
--- /dev/null
+++ b/debian/network-manager.links
@@ -0,0 +1 @@
+lib/systemd/system/NetworkManager.service lib/systemd/system/network-manager.service
diff --git a/debian/patches/03-systemd.patch b/debian/patches/03-systemd.patch
index 7d3d3d9d..2597d698 100644
--- a/debian/patches/03-systemd.patch
+++ b/debian/patches/03-systemd.patch
@@ -1,6 +1,4 @@
 Description: Debian specific tweaks for NetworkManager systemd service file
- - Install an alias named network-manager.service as the legacy SysV init script
-   in Debian is called network-manager.
  - 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>
@@ -14,10 +12,3 @@ Author: Michael Biebl <biebl@debian.org>
  
  [Service]
  Type=dbus
-@@ -17,5 +15,5 @@
- [Install]
- WantedBy=multi-user.target
- Alias=dbus-org.freedesktop.NetworkManager.service
-+Alias=network-manager.service
- Also=NetworkManager-dispatcher.service
--