diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2013-06-23 12:08:03 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-06-23 12:08:03 +0200 |
| commit | 223db868a83d39e38bb5d7cda68a91bbceccd8a5 (patch) | |
| tree | 16ae7936c146a68267951a9744bca22d29ed4945 | |
| parent | ce6777c53b8a147d0764d46071fa5b9ea46ecb9e (diff) | |
dbus: no need for systemd and nosystemd setups of the service file
We can just merge them.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 11 | ||||
| -rw-r--r-- | data/org.freedesktop.ModemManager1.service.in (renamed from data/org.freedesktop.ModemManager1.service.systemd.in) | 2 | ||||
| -rw-r--r-- | data/org.freedesktop.ModemManager1.service.nosystemd.in | 4 |
4 files changed, 3 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index abba9c3d..09310f6a 100644 --- a/configure.ac +++ b/configure.ac @@ -268,6 +268,7 @@ data/Makefile data/ModemManager.pc data/mm-glib.pc data/org.freedesktop.ModemManager1.policy.in +data/org.freedesktop.ModemManager1.service include/Makefile include/ModemManager-version.h build-aux/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 2ff96626..3a31ec51 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -34,16 +34,7 @@ endif # DBus Activation file dbusactivationdir = $(datadir)/dbus-1/system-services dbusactivation_DATA = org.freedesktop.ModemManager1.service -dbusactivation_in_files_systemd = org.freedesktop.ModemManager1.service.systemd.in -dbusactivation_in_files_nosystemd = org.freedesktop.ModemManager1.service.nosystemd.in -if HAVE_SYSTEMD -org.freedesktop.ModemManager1.service: org.freedesktop.ModemManager1.service.systemd.in - $(edit) $< >$@ -else -org.freedesktop.ModemManager1.service: org.freedesktop.ModemManager1.service.nosystemd.in - $(edit) $< >$@ -endif - +dbusactivation_in_files = org.freedesktop.ModemManager1.service.in # Icon icondir=${datadir}/icons/hicolor/22x22/apps diff --git a/data/org.freedesktop.ModemManager1.service.systemd.in b/data/org.freedesktop.ModemManager1.service.in index f4e2b266..175f3dd2 100644 --- a/data/org.freedesktop.ModemManager1.service.systemd.in +++ b/data/org.freedesktop.ModemManager1.service.in @@ -6,6 +6,6 @@ [D-BUS Service] Name=org.freedesktop.ModemManager1 -Exec=/bin/false +Exec=@sbindir@/ModemManager User=root SystemdService=dbus-org.freedesktop.ModemManager1.service diff --git a/data/org.freedesktop.ModemManager1.service.nosystemd.in b/data/org.freedesktop.ModemManager1.service.nosystemd.in deleted file mode 100644 index 4e3a273f..00000000 --- a/data/org.freedesktop.ModemManager1.service.nosystemd.in +++ /dev/null @@ -1,4 +0,0 @@ -[D-BUS Service] -Name=org.freedesktop.ModemManager1 -Exec=@sbindir@/ModemManager -User=root |