systemd: fix up dispatcher unit install (rh #948433)

Lennart sez:

"Oh, I wasn't aware it is short-lived only. In that case, drop the
multi-user.target bit, and just make it create the dbus alias.

[Install]
Alias=dbus-org.freedesktop.nm-dispatcher.service

And yeah, adding Also=NetworkManager-dispatcher.service to
NetworkManager.service certainly would be a good idea."

diff --git a/data/NetworkManager-dispatcher.service.in b/data/NetworkManager-dispatcher.service.in
index b406c5c..442f67a 100644 (file)
--- a/data/NetworkManager-dispatcher.service.in
+++ b/data/NetworkManager-dispatcher.service.in
@@ -7,6 +7,5 @@ BusName=org.freedesktop.nm_dispatcher
 ExecStart=@libexecdir@/nm-dispatcher.action
 
 [Install]
-WantedBy=multi-user.target
 Alias=dbus-org.freedesktop.nm-dispatcher.service
 

diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
index 012f872..8ceefad 100644 (file)
--- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in
@@ -13,4 +13,5 @@ KillMode=process
 [Install]
 WantedBy=multi-user.target
 Alias=dbus-org.freedesktop.NetworkManager.service
+Also=NetworkManager-dispatcher.service