Merge branch 'jb37678_systemd_service' into 'master'

Handle D-Bus autostart via systemd See merge request !1
sailfishos · Jun 13, 2017 · 28ce1e3 · 28ce1e3
2 parents 71f6fbe + 634eb74
commit 28ce1e3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -347,6 +347,9 @@ else
 	install -m755 -d $(ROOT)$(PREFIX)/share/dbus-1/services
 	install -m644 profiled.service \
 		$(ROOT)$(PREFIX)/share/dbus-1/services/profiled.service
+	install -m755 -d $(ROOT)$(PREFIX)/lib/systemd/user/
+	install -m644 systemd/profiled.service \
+		$(ROOT)$(PREFIX)/lib/systemd/user/
 endif
 # ----------------------------------------------------------------------------
 # profileclient.deb

diff --git a/profiled.service b/profiled.service
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=com.nokia.profiled
-Exec=/usr/bin/profiled
+Exec=/bin/false
+SystemdService=profiled.service
diff --git a/rpm/profiled.spec b/rpm/profiled.spec
@@ -87,6 +87,7 @@ rm %{buildroot}/%{_libdir}/libprofile.a
 %{_bindir}/%{name}
 %{_libdir}/libprofile.so.*
 %{_datadir}/dbus-1/services/profiled.service
+%{_libdir}/systemd/user/profiled.service
 
 %files doc
 %defattr(-,root,root,-)

diff --git a/systemd/profiled.service b/systemd/profiled.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Profile Daemon
+
+[Service]
+Type=dbus
+BusName=com.nokia.profiled
+ExecStart=/usr/bin/profiled