diff options
| author | Dan Williams <dcbw@redhat.com> | 2013-05-15 09:28:16 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2013-06-03 10:53:07 -0500 |
| commit | 06a415d9ea2d3155ffa7bdfed999191f31f1f9ef (patch) | |
| tree | e7320e27d63dadaeba152859106a48e0e655518f | |
| parent | baf820e0c14ae3acf6df2e41f43f5422dcd1bdda (diff) | |
systemd: add service for dispatcher (rh #948433)
| -rw-r--r-- | callouts/org.freedesktop.nm_dispatcher.service.in | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 11 | ||||
| -rw-r--r-- | data/NetworkManager-dispatcher.service.in | 12 |
3 files changed, 22 insertions, 2 deletions
diff --git a/callouts/org.freedesktop.nm_dispatcher.service.in b/callouts/org.freedesktop.nm_dispatcher.service.in index b8f5bd1a80..9feb3b468b 100644 --- a/callouts/org.freedesktop.nm_dispatcher.service.in +++ b/callouts/org.freedesktop.nm_dispatcher.service.in @@ -2,4 +2,5 @@ Name=org.freedesktop.nm_dispatcher Exec=@libexecdir@/nm-dispatcher.action User=root +SystemdService=dbus-org.freedesktop.nm-dispatcher.service diff --git a/data/Makefile.am b/data/Makefile.am index ffdff9f760..19b7b3eba3 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,8 @@ if HAVE_SYSTEMD systemdsystemunit_DATA = \ NetworkManager.service \ - NetworkManager-wait-online.service + NetworkManager-wait-online.service \ + NetworkManager-dispatcher.service NetworkManager.service: NetworkManager.service.in $(edit) $< >$@ @@ -10,6 +11,9 @@ NetworkManager.service: NetworkManager.service.in NetworkManager-wait-online.service: NetworkManager-wait-online.service.in $(edit) $< >$@ +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) @@ -28,17 +32,20 @@ edit = sed \ -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|@localstatedir[@]|$(localstatedir)|g' + -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@libexecdir[@]|$(libexecdir)|g' EXTRA_DIST = \ NetworkManager.service.in \ NetworkManager-wait-online.service.in \ + NetworkManager-dispatcher.service.in \ org.freedesktop.NetworkManager.service.in \ server.conf.in CLEANFILES = \ NetworkManager.service \ NetworkManager-wait-online.service \ + NetworkManager-dispatcher.service \ org.freedesktop.NetworkManager.service \ server.conf diff --git a/data/NetworkManager-dispatcher.service.in b/data/NetworkManager-dispatcher.service.in new file mode 100644 index 0000000000..b406c5c6a2 --- /dev/null +++ b/data/NetworkManager-dispatcher.service.in @@ -0,0 +1,12 @@ +[Unit] +Description=Network Manager Script Dispatcher Service + +[Service] +Type=dbus +BusName=org.freedesktop.nm_dispatcher +ExecStart=@libexecdir@/nm-dispatcher.action + +[Install] +WantedBy=multi-user.target +Alias=dbus-org.freedesktop.nm-dispatcher.service + |