Don't make NetworkManager D-Bus activatable

If the daemon has been stopped manually, we don't want it to be
autostarted by client requests.

Closes: #760998

4 files changed, 55 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 97a668bae..fa07a6b9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+network-manager (0.9.10.0-7) UNRELEASED; urgency=medium
+
+  * Don't make NetworkManager D-Bus activatable. If the daemon has been
+    stopped manually, we don't want it to be autostarted by client requests.
+    (Closes: #760998)
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 31 Mar 2015 06:58:04 +0200
+
 network-manager (0.9.10.0-6) unstable; urgency=medium
 
   * Detect at runtime whether to start ModemManager. When not running under
diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst
index 62aadf1e4..619162849 100644
--- a/debian/network-manager.preinst
+++ b/debian/network-manager.preinst
@@ -25,6 +25,12 @@ case "$1" in
 	    fi
 	fi
 
+	if dpkg --compare-versions "$2" lt "0.9.10.0-7"; then
+	    if [ -L /etc/systemd/system/dbus-org.freedesktop.NetworkManager.service ]; then
+	        rm -f /etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
+	    fi
+	fi
+
 	# Upgrade from previous versions
 	if dpkg --compare-versions "$2" lt "0.9.7.997-2"; then
 	    # Move old pid file to /var/run/NetworkManager so the init script
diff --git a/debian/patches/0019-Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/0019-Don-t-make-NetworkManager-D-Bus-activatable.patch
new file mode 100644
index 000000000..ce0283677
--- /dev/null
+++ b/debian/patches/0019-Don-t-make-NetworkManager-D-Bus-activatable.patch
@@ -0,0 +1,40 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Sun, 29 Mar 2015 22:57:50 +0200
+Subject: Don't make NetworkManager D-Bus activatable
+
+If the NetworkManager daemon has been stopped manually we don't want it
+to be autostarted by a client request.
+---
+ data/Makefile.am               | 7 -------
+ data/NetworkManager.service.in | 1 -
+ 2 files changed, 8 deletions(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index e91361a..a7c8070 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -19,13 +19,6 @@ endif
+ NetworkManager-dispatcher.service: NetworkManager-dispatcher.service.in
+ 	$(edit) $< >$@
+ 
+-servicedir = $(datadir)/dbus-1/system-services
+-service_in_files = org.freedesktop.NetworkManager.service.in
+-service_DATA = $(service_in_files:.service.in=.service)
+-
+-$(service_DATA): $(service_in_files) Makefile
+-	$(edit) $< >$@
+-
+ install-exec-local:
+ 	install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
+ 	ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants
+diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
+index 1883b40..5282e5b 100644
+--- a/data/NetworkManager.service.in
++++ b/data/NetworkManager.service.in
+@@ -11,6 +11,5 @@ KillMode=process
+ 
+ [Install]
+ WantedBy=multi-user.target
+-Alias=dbus-org.freedesktop.NetworkManager.service
+ Also=NetworkManager-dispatcher.service
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f5f29b205..144476cf7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
 0016-core-tell-systemd-to-restart-NetworkManager.service-.patch
 0017-Check-at-runtime-whether-to-start-ModemManager.patch
 0018-core-do-not-assert-when-a-device-is-enslaved-externa.patch
+0019-Don-t-make-NetworkManager-D-Bus-activatable.patch