diff options
| author | Michael Biebl <biebl@debian.org> | 2015-03-29 22:57:50 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-10-30 10:16:29 +0100 |
| commit | 305585a9b7968e558ba18d881fae16106bb65891 (patch) | |
| tree | dbe04e7aab49cf68f61eca59d34cb7ac2701b8bf | |
| parent | c37f7f072d8a5f8dffe7a748c647048135e46ef3 (diff) | |
| download | NetworkManager-305585a9b7968e558ba18d881fae16106bb65891.tar.gz | |
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.
| -rw-r--r-- | data/Makefile.am | 7 | ||||
| -rw-r--r-- | data/NetworkManager.service.in | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index ce059fcb0f..4ab410644f 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 980573d31c..e712009cf2 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -14,6 +14,5 @@ KillMode=process [Install] WantedBy=multi-user.target -Alias=dbus-org.freedesktop.NetworkManager.service Also=NetworkManager-dispatcher.service |