diff options
| author | Michael Biebl <biebl@debian.org> | 2015-03-31 07:03:05 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-03-31 07:03:09 +0200 |
| commit | e5b351239917dcb198990eb114ac8e226eec7f95 (patch) | |
| tree | 3a9436893ddca232673813cb856b921f14637a79 /debian/patches | |
| parent | e69604d483486e6b32d10c9e11fa306c36b35dac (diff) | |
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
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0019-Don-t-make-NetworkManager-D-Bus-activatable.patch | 40 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 41 insertions, 0 deletions
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 00000000..ce028367 --- /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 f5f29b20..144476cf 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 |