diff options
| author | Michael Biebl <biebl@debian.org> | 2015-03-29 22:57:50 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-10-12 12:54:02 +0200 |
| commit | 90f71c0f99b006df8135cf76ac8a44308f954450 (patch) | |
| tree | f866f0d936d52192917d853784058a9591299304 /Makefile.am | |
| parent | cec7ade86c2ac2a20a5b3cdabcf375ece347dd76 (diff) | |
systemd: 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.
[lkundrak@v3.sk: The auto-activation is probably more surprising than useful.
Services that need NetworkManager API should depend on NetworkManager service
directly.
I have no idea what purpose does the D-Bus service file serve nowadays,
but it looks rather hacky (really, activating /bin/false) and the comment
in it suggests that the autoactivating behavior was not intended anyway.
Debian has been shipping this for quite some time and no complains have been
heard.]
https://github.com/NetworkManager/NetworkManager/pull/230
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index c9137595e..5c1af3a0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4140,11 +4140,6 @@ endif data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in $(AM_V_GEN) $(data_edit) $< >$@ -data/org.freedesktop.NetworkManager.service: $(srcdir)/data/org.freedesktop.NetworkManager.service.in - $(AM_V_GEN) $(data_edit) $< >$@ - -service_DATA += data/org.freedesktop.NetworkManager.service - endif examples_DATA += data/server.conf @@ -4166,7 +4161,6 @@ EXTRA_DIST += \ data/NetworkManager-wait-online.service.in \ data/NetworkManager-wait-online-systemd-pre200.service.in \ data/NetworkManager-dispatcher.service.in \ - data/org.freedesktop.NetworkManager.service.in \ data/84-nm-drivers.rules \ data/85-nm-unmanaged.rules \ data/90-nm-thunderbolt.rules \ @@ -4177,7 +4171,6 @@ CLEANFILES += \ data/NetworkManager.service \ data/NetworkManager-wait-online.service \ data/NetworkManager-dispatcher.service \ - data/org.freedesktop.NetworkManager.service \ data/server.conf ############################################################################### |