Change spec and service file to launch murphyd for system-wide and to change UID...

Change-Id: I5f43dc25215d427e7e90f8ab198763e7888bb6a8
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/murphy.spec b/packaging/murphy.spec
index eca92a8454b87def96c037b6607bac8a7999be22..f8c9355b7addd8f555223214449572e8397e0221 100644 (file)
--- a/packaging/murphy.spec
+++ b/packaging/murphy.spec
@@ -293,9 +293,8 @@ mkdir -p %{buildroot}%{_tmpfilesdir}
 cp packaging/murphyd.conf %{buildroot}%{_tmpfilesdir}
 
 # Copy the systemd files in place.
-#mkdir -p %%{buildroot}%%{_unitdir}
-mkdir -p %{buildroot}%{_unitdir_user}
-cp packaging/murphyd.service %{buildroot}%{_unitdir_user}
+mkdir -p %{buildroot}%{_unitdir}
+cp packaging/murphyd.service %{buildroot}%{_unitdir}
 
 %if %{with dbus}
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
@@ -309,13 +308,13 @@ cp packaging/org.Murphy.conf \
 rm -rf %{buildroot}
 
 %post
-/bin/systemctl --user enable --global murphyd.service
+/bin/systemctl enable murphyd.service
 #setcap 'cap_net_admin=+ep' %{_bindir}/murphyd
 ldconfig
 
 %postun
 if [ "$1" = "0" ]; then
-systemctl --user disable --global murphyd.service
+systemctl disable murphyd.service
 fi
 ldconfig
 
@@ -356,7 +355,7 @@ ldconfig
 %manifest murphy.manifest
 %{_bindir}/murphyd
 %config %{_sysconfdir}/murphy
-%{_unitdir_user}/murphyd.service
+%{_unitdir}/murphyd.service
 %{_tmpfilesdir}/murphyd.conf
 %if %{with dbus}
 %{_sysconfdir}/dbus-1/system.d

diff --git a/packaging/murphyd.service b/packaging/murphyd.service
index 60842b1ee167ad5964c9d4216e89c5af62cd0fa3..c31e1652ea3794ec7ea98ba6ca5c0548924185e1 100644 (file)
--- a/packaging/murphyd.service
+++ b/packaging/murphyd.service
@@ -2,9 +2,12 @@
 Description=Murphy Resource Policy Daemon
 
 [Service]
-Type=simple
 ExecStart=/usr/bin/murphyd -t dlog -vvv -f
-KillSignal=SIGTERM
+Restart=always
+RestartSec=0
+User=multimedia_fw
+Group=multimedia_fw
+SmackProcessLabel=System
 
 [Install]
 WantedBy=default.target