From b074148b4b604870d038168f49d6bf1687eaf143 Mon Sep 17 00:00:00 2001
From: kmook <kmook.choi@samsung.com>
Date: Wed, 3 Aug 2016 10:32:07 +0900
Subject: [PATCH] Changed to user daemon

Change-Id: Ib5a0c8a360bf6382c1a8343c3c891823e75e8c17
Signed-off-by: kmook <kmook.choi@samsung.com>
---
 CMakeLists.txt                          |  2 +-
 packaging/app-comm-svc.spec             | 14 +++++---------
 packaging/org.tizen.multiscreen.service |  4 +---
 packaging/remote-server.service         |  5 +----
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 307b2f0..48af3f5 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,7 +138,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME}
 
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/MSF-Node/org.tizen.multiscreen DESTINATION ${NODE_DIR})
 
-INSTALL(FILES packaging/org.tizen.multiscreen.service packaging/remote-server.service DESTINATION /usr/lib/systemd/system)
+INSTALL(FILES packaging/org.tizen.multiscreen.service packaging/remote-server.service DESTINATION /usr/lib/systemd/user)
 INSTALL(TARGETS ${PROJECT_NAME}  
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
diff --git a/packaging/app-comm-svc.spec b/packaging/app-comm-svc.spec
index ec4fbd0..6882882 100755
--- a/packaging/app-comm-svc.spec
+++ b/packaging/app-comm-svc.spec
@@ -81,16 +81,14 @@ mkdir -p %{buildroot}/usr/share/license
 cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license/%{name}
 
 %make_install
-mkdir -p %{buildroot}%{_libdir}/systemd/system
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-ln -sf ../%{name}.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/%{name}.service
-ln -sf ../org.tizen.multiscreen.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/org.tizen.multiscreen.service
 rm -Rf %{buildroot}%{_descriptiondir}
 mkdir -p %{buildroot}%{_descriptiondir}
 mkdir -p %{buildroot}/usr/apps/org.tizen.multiscreen
 
 %post
-systemctl enable remote-server.service
+mkdir -p %{_unitdir_user}/default.target.wants
+ln -s ../%{name}.service %{_unitdir_user}/default.target.wants/
+ln -s ../org.tizen.multiscreen.service %{_unitdir_user}/default.target.wants/
 /sbin/ldconfig
 
 %postun
@@ -100,10 +98,8 @@ systemctl enable remote-server.service
 %manifest remote-server.manifest
 %defattr(-,system,system,-)
 %{_bindir}/remote-server
-%{_libdir}/systemd/system/%{name}.service
-%{_libdir}/systemd/system/org.tizen.multiscreen.service
-%{_libdir}/systemd/system/multi-user.target.wants/%{name}.service
-%{_libdir}/systemd/system/multi-user.target.wants/org.tizen.multiscreen.service
+%attr(644,root,root) %{_unitdir_user}/%{name}.service
+%attr(644,root,root) %{_unitdir_user}/org.tizen.multiscreen.service
 %{_node_dir}/*
 /usr/share/license/%{name}
 
diff --git a/packaging/org.tizen.multiscreen.service b/packaging/org.tizen.multiscreen.service
index 9b435dd..168428e 100755
--- a/packaging/org.tizen.multiscreen.service
+++ b/packaging/org.tizen.multiscreen.service
@@ -3,11 +3,9 @@ Description=Node server start
 After=remote-server.service
 
 [Service]
-User=system_fw
-Group=system_fw
 Type=simple
 ExecStart = /usr/bin/node /usr/apps/org.tizen.multiscreen/server/server.js
 Restart=always
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target
diff --git a/packaging/remote-server.service b/packaging/remote-server.service
index f90a8a9..5bac41c 100755
--- a/packaging/remote-server.service
+++ b/packaging/remote-server.service
@@ -3,12 +3,9 @@ Description=Remote Server service
 After=dlog-main.service dbus.service
 
 [Service]
-User=system_fw
-Group=system_fw
 Type=simple
 ExecStart=/usr/bin/remote-server
 Restart=always
 
 [Install]
-WantedBy=multi-user.target
-
+WantedBy=default.target
-- 
2.7.4