diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 13 | ||||
| -rw-r--r-- | data/ModemManager.service.in | 1 | ||||
| -rw-r--r-- | data/org.freedesktop.ModemManager1.service.nosystemd.in (renamed from data/org.freedesktop.ModemManager1.service.in) | 1 | ||||
| -rw-r--r-- | data/org.freedesktop.ModemManager1.service.systemd.in | 11 |
5 files changed, 24 insertions, 4 deletions
@@ -25,6 +25,8 @@ libtool *.tar.bz2 *.pyc *.dirstamp +org.freedesktop.ModemManager.service +org.freedesktop.ModemManager.conf callouts/mm-modem-probe test/lsudev diff --git a/data/Makefile.am b/data/Makefile.am index 0e0c391e..2ff96626 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -33,10 +33,17 @@ endif # DBus Activation file dbusactivationdir = $(datadir)/dbus-1/system-services -dbusactivation_in_files = org.freedesktop.ModemManager1.service.in -org.freedesktop.ModemManager1.service: org.freedesktop.ModemManager1.service.in - $(edit) $< >$@ 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 + # Icon icondir=${datadir}/icons/hicolor/22x22/apps diff --git a/data/ModemManager.service.in b/data/ModemManager.service.in index e90ebdf5..b59caeae 100644 --- a/data/ModemManager.service.in +++ b/data/ModemManager.service.in @@ -10,3 +10,4 @@ StandardError=null [Install] WantedBy=multi-user.target +Alias=dbus-org.freedesktop.ModemManager1.service diff --git a/data/org.freedesktop.ModemManager1.service.in b/data/org.freedesktop.ModemManager1.service.nosystemd.in index 03be9181..4e3a273f 100644 --- a/data/org.freedesktop.ModemManager1.service.in +++ b/data/org.freedesktop.ModemManager1.service.nosystemd.in @@ -2,4 +2,3 @@ Name=org.freedesktop.ModemManager1 Exec=@sbindir@/ModemManager User=root -SystemdService=ModemManager.service diff --git a/data/org.freedesktop.ModemManager1.service.systemd.in b/data/org.freedesktop.ModemManager1.service.systemd.in new file mode 100644 index 00000000..f4e2b266 --- /dev/null +++ b/data/org.freedesktop.ModemManager1.service.systemd.in @@ -0,0 +1,11 @@ +# This D-Bus service activation file is only for systemd support since +# an auto-activated ModemManager would be quite surprising for those people +# who have MM 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 MM +# systemd .service file. + +[D-BUS Service] +Name=org.freedesktop.ModemManager1 +Exec=/bin/false +User=root +SystemdService=dbus-org.freedesktop.ModemManager1.service |