Fixed systemd unit files

Fixed phoned launch paths and systemd unit configurations so that
it can be launched properly on start up. Fixed permission to run
as app user instead of root.

Change-Id: Ib94f65fd35e1e53a58369ce0235be20d8ff65e04
Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f309d6d..1155271 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,9 +65,9 @@ ADD_DEFINITIONS("-std=c++11")
 # Global variables
 # -----------------------------------------------------------------------------
 
-SET(DESTINATION_PREFIX sbin)
+SET(DESTINATION_PREFIX bin)
 SET(DBUS_SERVICE_PREFIX share/dbus-1/services)
-SET(SYSTEMD_SERVICE_PREFIX lib/systemd/user)
+SET(SYSTEMD_SERVICE_PREFIX lib/systemd/system)
 
 # -----------------------------------------------------------------------------
 # Macros for pkgconfig

diff --git a/packaging/phoned.changes b/packaging/phoned.changes
index df9a855..11c1d09 100644 (file)
--- a/packaging/phoned.changes
+++ b/packaging/phoned.changes
@@ -1,3 +1,6 @@
+* Wed Aug 27 2014 Jimmy Huang <jimmy.huang@intel.com> submit/tizen/20140416.223255-3-g9e04e01
+- Fixed systemd unit files
+
 * Mon Apr 14 2014 brianjjones <brian.j.jones@intel.com> accepted/tizen/ivi/release/20140404.212421@5627815
 - Memory leak fix patch
 

diff --git a/packaging/phoned.spec b/packaging/phoned.spec
index 6ed3f77..db14dcd 100644 (file)
--- a/packaging/phoned.spec
+++ b/packaging/phoned.spec
@@ -33,9 +33,12 @@ make %{?jobs:-j%jobs} VERBOSE=1
 rm -rf %{buildroot}
 %make_install
 
+%install_service multi-user.target.wants phoned.service
+
 %files
 %{_libdir}/pkgconfig/phoned.pc
-%{_prefix}/sbin/phoned
+%{_prefix}/bin/phoned
 %{_prefix}/share/dbus-1/services/org.tizen.phone.service
-%{_prefix}/lib/systemd/user/phoned.service
+%{_unitdir}/phoned.service
+%{_unitdir}/multi-user.target.wants/phoned.service
 

diff --git a/scripts/phoned.service b/scripts/phoned.service
index b72d284..965d810 100644 (file)
--- a/scripts/phoned.service
+++ b/scripts/phoned.service
@@ -1,10 +1,13 @@
 [Unit]
 Description=Service to provide/export Phone functionality
-After=sound.target
+After=ofono.service
 
 [Service]
-ExecStart=/usr/sbin/phoned
+Type=dbus
+User=app
+BusName=org.tizen.phone
+ExecStart=/usr/bin/phoned
 Type=simple
 
 [Install]
-WantedBy=tizen-middleware.target
+WantedBy=multi-user.target