Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #35 from nemomobile/jb24120
Prevent ssu startup when system is shutting down.
  • Loading branch information
saukko committed Feb 10, 2015
2 parents 0b1a248 + 42fa140 commit 8fe0482
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
6 changes: 4 additions & 2 deletions dbus/org.nemo.ssu.service
@@ -1,5 +1,7 @@
[D-BUS Service]
Interface=org.nemo.ssu
Name=org.nemo.ssu
Exec=/usr/bin/ssud
User=root
Exec=/bin/false
User=root
SystemdService=dbus-org.nemo.ssu.service

1 change: 1 addition & 0 deletions rpm/ssu.spec
Expand Up @@ -36,6 +36,7 @@ Requires: ssu-network-proxy
# them for the vendor data packages to use
%attr(0755, -, -) %{_oneshotdir}/*
%{_bindir}/ssud
/lib/systemd/system/*.service
%{_datadir}/dbus-1/system-services/*.service
%{_sysconfdir}/dbus-1/system.d/*.conf

Expand Down
5 changes: 4 additions & 1 deletion ssud/ssud.pro
Expand Up @@ -13,10 +13,13 @@ SOURCES = ssuadaptor.cpp \

DBUS_SERVICE_NAME=org.nemo.ssu

systemd.files = ../systemd/dbus-$${DBUS_SERVICE_NAME}.service
systemd.path = /lib/systemd/system/

service.files = ../dbus/$${DBUS_SERVICE_NAME}.service
service.path = /usr/share/dbus-1/system-services/

conf.files = ../dbus/$${DBUS_SERVICE_NAME}.conf
conf.path = /etc/dbus-1/system.d/

INSTALLS += service conf
INSTALLS += systemd service conf
8 changes: 8 additions & 0 deletions systemd/dbus-org.nemo.ssu.service
@@ -0,0 +1,8 @@
[Unit]
Description=SSU service

[Service]
Type=dbus
BusName=org.nemo.ssu
ExecStart=/usr/bin/ssud

0 comments on commit 8fe0482

Please sign in to comment.