diff -Nru network-manager-0.9.10.0/debian/changelog network-manager-0.9.10.0/debian/changelog --- network-manager-0.9.10.0/debian/changelog 2015-03-14 06:44:27.000000000 +0000 +++ network-manager-0.9.10.0/debian/changelog 2015-03-31 08:13:32.000000000 +0000 @@ -1,3 +1,11 @@ +network-manager (0.9.10.0-4ubuntu12) vivid; 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. + Patch taken from Debian git, thanks Michael Biebl! (Closes: #760998) + + -- Martin Pitt Tue, 31 Mar 2015 10:13:22 +0200 + network-manager (0.9.10.0-4ubuntu11) vivid; urgency=medium * Disable 0001-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch. diff -Nru network-manager-0.9.10.0/debian/network-manager.preinst network-manager-0.9.10.0/debian/network-manager.preinst --- network-manager-0.9.10.0/debian/network-manager.preinst 2015-03-14 06:44:27.000000000 +0000 +++ network-manager-0.9.10.0/debian/network-manager.preinst 2015-03-31 08:13:32.000000000 +0000 @@ -25,6 +25,12 @@ fi fi + if dpkg --compare-versions "$2" lt "0.9.10.0-4ubuntu12"; 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 -Nru network-manager-0.9.10.0/debian/patches/0019-Don-t-make-NetworkManager-D-Bus-activatable.patch network-manager-0.9.10.0/debian/patches/0019-Don-t-make-NetworkManager-D-Bus-activatable.patch --- network-manager-0.9.10.0/debian/patches/0019-Don-t-make-NetworkManager-D-Bus-activatable.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-0.9.10.0/debian/patches/0019-Don-t-make-NetworkManager-D-Bus-activatable.patch 2015-03-31 08:13:32.000000000 +0000 @@ -0,0 +1,40 @@ +From: Michael Biebl +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 -Nru network-manager-0.9.10.0/debian/patches/series network-manager-0.9.10.0/debian/patches/series --- network-manager-0.9.10.0/debian/patches/series 2015-03-14 06:44:27.000000000 +0000 +++ network-manager-0.9.10.0/debian/patches/series 2015-03-31 08:13:32.000000000 +0000 @@ -13,6 +13,7 @@ 0012-fix-arping-path.patch 0013-fix-dhclient-abnormal-exit-due-to-SIGPIPE.patch 0014-log-DHCLIENT-exit-status-better.patch +0019-Don-t-make-NetworkManager-D-Bus-activatable.patch demarshal_int64_properties.patch fix-NetworkManager-wait-online.service.patch