diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-08-12 11:15:26 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-08-12 11:15:26 -0500 |
| commit | 4b44a2bd540eaef0860d8c76fc3c620847efcad7 (patch) | |
| tree | 90aca0d99a33d6118fdab5d715ddf779fb9d9d83 /data | |
| parent | 37c578a2a25a232321f3a541304a11983ef7fcec (diff) | |
| download | NetworkManager-4b44a2bd540eaef0860d8c76fc3c620847efcad7.tar.gz | |
core: add systemd unit support
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 26 | ||||
| -rw-r--r-- | data/NetworkManager.service.in | 12 | ||||
| -rw-r--r-- | data/org.freedesktop.NetworkManager.service.in | 11 |
3 files changed, 49 insertions, 0 deletions
diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000000..f91d3a8255 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,26 @@ + +if HAVE_SYSTEMD +systemdsystemunit_DATA = NetworkManager.service + +NetworkManager.service: NetworkManager.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) $< >$@ +endif + +edit = sed \ + -e 's|@sbindir[@]|$(sbindir)|g' \ + -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ + -e 's|@localstatedir[@]|$(localstatedir)|g' + +EXTRA_DIST = \ + NetworkManager.service.in \ + org.freedesktop.NetworkManager.service.in + +CLEANFILES = NetworkManager.service org.freedesktop.NetworkManager.service + diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in new file mode 100644 index 0000000000..c2741fcc19 --- /dev/null +++ b/data/NetworkManager.service.in @@ -0,0 +1,12 @@ +[Unit] +Description=Network Manager +After=syslog.target + +[Service] +Type=dbus +BusName=org.freedesktop.NetworkManager +ExecStart=@sbindir@/NetworkManager --no-daemon + +[Install] +WantedBy=network.target multi-user.target +Alias=NetworkManager-by-dbus diff --git a/data/org.freedesktop.NetworkManager.service.in b/data/org.freedesktop.NetworkManager.service.in new file mode 100644 index 0000000000..7434903bad --- /dev/null +++ b/data/org.freedesktop.NetworkManager.service.in @@ -0,0 +1,11 @@ +# This D-Bus service activation file is only for systemd support since +# an auto-activated NetworkManager would be quite surprising for those people +# who have NM installed but turned off. Thus the Exec path available to +# D-Bus is /bin/false, but systemd knows the real Exec path due to the NM +# systemd .service file. + +[D-BUS Service] +Name=org.freedesktop.NetworkManager +Exec=/bin/false +User=root +SystemdService=NetworkManager-by-dbus.service |