Fix systemd settings

 - Changed to install under /usr/lib/systemd/system
 - Remove 'System' User/Group from systemd service file

Change-Id: I93809a146c3eb39c69b2f2dd884c564c4631f1bc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f85b49..ebbc4d8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@ PROJECT(telephony-daemon C)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
 SET(LIBDIR ${LIB_INSTALL_DIR})
+SET(UNITDIR ${UNIT_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
 
 # Set required packages
@@ -53,4 +54,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-ldl")
 # install
 INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME telephony-daemon)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/packaging/telephony-daemon.service DESTINATION ${LIBDIR}/systemd/system)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/packaging/telephony-daemon.service DESTINATION ${UNITDIR})

diff --git a/packaging/telephony-daemon.service b/packaging/telephony-daemon.service
index 61af9ed..c3300fc 100644 (file)
--- a/packaging/telephony-daemon.service
+++ b/packaging/telephony-daemon.service
@@ -3,8 +3,6 @@ Description=Telephony daemon
 After=secure-storage.service
 
 [Service]
-User=system
-Group=system
 ExecStart=/usr/bin/telephony-daemon
 Restart=always
 RestartSec=0

diff --git a/packaging/telephony-daemon.spec b/packaging/telephony-daemon.spec
index 3b77daf..cad8379 100644 (file)
--- a/packaging/telephony-daemon.spec
+++ b/packaging/telephony-daemon.spec
@@ -1,6 +1,6 @@
 %define major 1
 %define minor 3
-%define patchlevel 34
+%define patchlevel 35
 
 Name:           telephony-daemon
 Version:        %{major}.%{minor}.%{patchlevel}
@@ -24,6 +24,7 @@ Description: Telephony Daemon
 %build
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DLIB_INSTALL_DIR=%{_libdir} \
+       -DUNIT_INSTALL_DIR=%{_unitdir} \
        -DVERSION=%{version} \
        -DTIZEN_DEBUG_ENABLE=1 \
 
@@ -32,8 +33,8 @@ make %{?_smp_mflags}
 %install
 
 %make_install
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-ln -s %{_libdir}/systemd/system/telephony-daemon.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/telephony-daemon.service
+mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+ln -s %{_unitdir}/telephony-daemon.service %{buildroot}%{_unitdir}/multi-user.target.wants/telephony-daemon.service
 
 %post -p /sbin/ldconfig
 
@@ -41,6 +42,6 @@ ln -s %{_libdir}/systemd/system/telephony-daemon.service %{buildroot}%{_libdir}/
 %manifest telephony-daemon.manifest
 %defattr(644,system,system,-)
 %caps(cap_mac_override,cap_dac_override,cap_net_admin=eip) %attr(755,system,system) %{_bindir}/telephony-daemon
-%{_libdir}/systemd/system/telephony-daemon.service
-%{_libdir}/systemd/system/multi-user.target.wants/telephony-daemon.service
+%{_unitdir}/telephony-daemon.service
+%{_unitdir}/multi-user.target.wants/telephony-daemon.service
 %{_datadir}/license/telephony-daemon

diff --git a/telephony-daemon.manifest b/telephony-daemon.manifest
old mode 100755 (executable)
new mode 100644 (file)