diff options
author | Sangchul Lee <sc11.lee@samsung.com> | 2016-10-26 12:05:51 +0900 |
---|---|---|
committer | Sangchul Lee <sc11.lee@samsung.com> | 2016-10-26 17:22:32 +0900 |
commit | a833f980ecebaeca2a45571d6fe74c862f11fb55 (patch) | |
tree | 06d5ced1a658fba6be69e9143eec3b9698e3b40c | |
parent | 3cd3bd90f79aab9a99e3912317d17dc098cb96f0 (diff) | |
download | murphy-a833f980ecebaeca2a45571d6fe74c862f11fb55.tar.gz murphy-a833f980ecebaeca2a45571d6fe74c862f11fb55.tar.bz2 murphy-a833f980ecebaeca2a45571d6fe74c862f11fb55.zip |
Change spec and service file to launch murphyd for system-wide and to change UID/GID to multimedia_fwsubmit/tizen/20161108.054351accepted/tizen/wearable/20161109.002742accepted/tizen/tv/20161109.002649accepted/tizen/mobile/20161109.002454accepted/tizen/ivi/20161109.002826accepted/tizen/common/20161109.140239
Change-Id: I5f43dc25215d427e7e90f8ab198763e7888bb6a8
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>
-rw-r--r-- | packaging/murphy.spec | 11 | ||||
-rw-r--r-- | packaging/murphyd.service | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/packaging/murphy.spec b/packaging/murphy.spec index eca92a8..f8c9355 100644 --- 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 60842b1..c31e165 100644 --- 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 |