Use the default environment file for systemd

Change-Id: Id04977488c4a2599f95e16107e0d808f57901973

diff --git a/data-provider-master.manifest b/data-provider-master.manifest
index 89ceb02..1baa03a 100644 (file)
--- a/data-provider-master.manifest
+++ b/data-provider-master.manifest
@@ -51,9 +51,8 @@
                <!-- Init script -->
                <filesystem path="/etc/rc.d/init.d/data-provider-master" label="_" exec_label="none" />
                <filesystem path="/etc/rc.d/rc3.d/S99data-provider-master" label="_" exec_label="none" />
-
-               <filesystem path="/usr/lib/systemd/system/data-provider-master.service" label="_" />
-               <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/data-provider-master.service" label="_" />
+               <filesystem path="/usr/lib/systemd/user/data-provider-master.service" label="_" />
+               <filesystem path="/usr/lib/systemd/user/tizen-middleware.target.wants/data-provider-master.service" label="_" />
 
                <!-- Package manager plugin -->
                <filesystem path="/usr/etc/package-manager/parserlib/liblivebox.so" label="_" />

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index ade7015..772eac6 100644 (file)
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,2 +1,2 @@
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/data-provider-master DESTINATION /etc/rc.d/init.d/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/data-provider-master.service DESTINATION /usr/lib/systemd/system/ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/data-provider-master.service DESTINATION /usr/lib/systemd/user/ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)

diff --git a/data/data-provider-master.service b/data/data-provider-master.service
index b9c9e51..bf8a534 100644 (file)
--- a/data/data-provider-master.service
+++ b/data/data-provider-master.service
@@ -16,8 +16,7 @@
 
 [Unit]
 Description=Data Provider daemon
-After=rc-sdlevelinit.service
-Requires=rc-sdlevelinit.service
+After=xorg.target
 
 [Service]
 Environment=BUFMGR_LOCK_TYPE="once"
@@ -25,7 +24,7 @@ Environment=BUFMGR_MAP_CACHE="true"
 Type=simple
 ExecStart=/usr/bin/data-provider-master
 RestartSec=1
-Restart=restart-always
+Restart=always
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=tizen-middleware.target

diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec
index 15241ce..c1d54a9 100644 (file)
--- a/packaging/data-provider-master.spec
+++ b/packaging/data-provider-master.spec
@@ -57,12 +57,11 @@ mkdir -p %{buildroot}/opt/usr/share/live_magazine/reader
 mkdir -p %{buildroot}/opt/usr/share/live_magazine/always
 mkdir -p %{buildroot}/opt/dbspace
 mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc3.d
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+mkdir -p %{buildroot}/%{_libdir}/systemd/user/tizen-middleware.target.wants
 touch %{buildroot}/opt/dbspace/.livebox.db
 touch %{buildroot}/opt/dbspace/.livebox.db-journal
 ln -sf %{_sysconfdir}/rc.d/init.d/data-provider-master %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S99data-provider-master
-ln -sf ../data-provider-master.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/data-provider-master.service
-
+ln -sf %{_libdir}/systemd/user/data-provider-master.service %{buildroot}/%{_libdir}/systemd/user/tizen-middleware.target.wants/data-provider-master.service
 
 %pre
 # Executing the stop script for stopping the service of installed provider (old version)
@@ -96,8 +95,8 @@ echo "%{_sysconfdir}/init.d/data-provider-master start"
 %{_bindir}/liveinfo
 %{_prefix}/etc/package-manager/parserlib/*
 %{_datarootdir}/data-provider-master/*
-%{_libdir}/systemd/system/multi-user.target.wants/data-provider-master.service
-%{_libdir}/systemd/system/data-provider-master.service
+%{_libdir}/systemd/user/data-provider-master.service
+%{_libdir}/systemd/user/tizen-middleware.target.wants/data-provider-master.service
 %{_datarootdir}/license/*
 /opt/usr/share/live_magazine
 /opt/usr/share/live_magazine/log