Revise service script

Change-Id: Id489d33a741ef60820d687e28396932f34e24e8b
Signed-off-by: Hyunbin Lee <hyunbin.lee@samsung.com>

diff --git a/osp-app-service.manifest b/osp-app-service.manifest
index f16bdc2..4fa5810 100644 (file)
--- a/osp-app-service.manifest
+++ b/osp-app-service.manifest
@@ -16,6 +16,6 @@
                <filesystem path="/usr/lib/systemd/user/core-efl.target.wants/osp-app-service.service" label="_" exec_label="none" />
                <filesystem path="/etc/tmpfiles.d/osp-app-service.conf" label="_" exec_label="none" />
                <filesystem path="/usr/lib/systemd/system/osp-tmpdir-setup.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/system/basic.target.wants/osp-tmpdir-setup.service" label="_" exec_label="none" />
+               <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/osp-tmpdir-setup.service" label="_" exec_label="none" />
        </assign>
 </manifest>

diff --git a/packaging/osp-app-service.spec b/packaging/osp-app-service.spec
index 4d0ca89..e5b3c29 100644 (file)
--- a/packaging/osp-app-service.spec
+++ b/packaging/osp-app-service.spec
@@ -112,9 +112,9 @@ mkdir -p %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants
 install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/user/osp-app-service.service
 ln -s ../osp-app-service.service %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants/osp-app-service.service
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/basic.target.wants
+mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
 install -m 0644 %{SOURCE3} %{buildroot}%{_libdir}/systemd/system/osp-tmpdir-setup.service
-ln -s ../osp-tmpdir-setup.service %{buildroot}%{_libdir}/systemd/system/basic.target.wants/osp-tmpdir-setup.service
+ln -s ../osp-tmpdir-setup.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/osp-tmpdir-setup.service
 
 %post
 #/bin/rm -f /etc/ld.so.cache
@@ -151,5 +151,5 @@ fi
 %{_libdir}/systemd/user/osp-app-service.service
 %{_libdir}/systemd/user/core-efl.target.wants/osp-app-service.service
 %{_libdir}/systemd/system/osp-tmpdir-setup.service
-%{_libdir}/systemd/system/basic.target.wants/osp-tmpdir-setup.service
+%{_libdir}/systemd/system/multi-user.target.wants/osp-tmpdir-setup.service
 

diff --git a/packaging/osp-tmpdir-setup.service b/packaging/osp-tmpdir-setup.service
index 83769e6..72bd831 100644 (file)
--- a/packaging/osp-tmpdir-setup.service
+++ b/packaging/osp-tmpdir-setup.service
@@ -1,9 +1,6 @@
 [Unit]
 Description=OSP tmp directory setup
-DefaultDependencies=no
-After=tmp.mount systemd-tmpfiles-setup.service
-Requires=tmp.mount systemd-tmpfiles-setup.service
-Before=basic.target
+Before=ac.service
 ConditionPathExists=/usr/etc/.smack
 
 [Service]
@@ -12,8 +9,7 @@ ExecStart=/usr/bin/chsmack -a '_' /tmp/osp ; \
  /usr/bin/chsmack -a '*' -t /tmp/osp/share ; \
  /usr/bin/chsmack -a '*' /tmp/osp/cache ; \
  /usr/bin/chsmack -a '*' /tmp/osp/data-control/request ; \
- /usr/bin/chsmack -a '*' /tmp/osp/data-control/result ; \
- /usr/bin/chsmack -a 'osp::datacontrol' -t /tmp/osp
+ /usr/bin/chsmack -a '*' /tmp/osp/data-control/result
 RemainAfterExit=yes
 
 [Install]