[systemd] Fix oma-dm-agent service fail to start

Change-Id: Id7a2708e93ccf3ab798db55c0332e63a672b7b0f
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>

diff --git a/oma-dm b/oma-dm
deleted file mode 100755 (executable)
index a249223..0000000
--- a/oma-dm
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-DESC="OMA DM agent daemon"
-NAME=oma-dm-agent
-DAEMON=/usr/bin/$NAME
-SCRIPTNAME=/etc/init.d/oma-dm
-
-[ -x "$DAEMON" ] || exit 0
-
-do_start() {
-       PID=`pidof $NAME`
-       [ -z "$PID" ] || return 1
-       $DAEMON booting
-       RETVAL=$?
-       return "$RETVAL"
-}
-
-do_stop() {
-       PID=`pidof $NAME`
-       if [ -n "$PID" ]; then
-               kill $PID
-       fi
-       return 0
-}
-
-prt_res() {
-       RETVAL=$1
-
-       case "$RETVAL" in
-               0|1)
-                       echo "... done."
-                       RETVAL=0
-                       ;;
-               *)
-                       echo "... failed!"
-                       RETVAL=1
-                       ;;
-       esac
-
-       return $RETVAL
-}
-
-case "$1" in
-       start)
-               echo "Starting $DESC" "$NAME"
-               do_start
-               prt_res $?
-               ;;
-       stop)
-               echo "Stopping $DESC" "$NAME"
-               do_stop
-               prt_res $?
-               ;;
-       restart)
-               echo "Stopping $DESC" "$NAME"
-               do_stop
-               prt_res $?
-               sleep 2
-               echo "Starting $DESC" "$NAME"
-               do_start
-               prt_res $?
-               ;;
-       *)
-               echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2
-               exit 0
-               ;;
-esac
-
-exit 0

diff --git a/packaging/oma-dm-agent.service b/packaging/oma-dm-agent.service
index 3634e5b..35d9b7c 100755 (executable)
--- a/packaging/oma-dm-agent.service
+++ b/packaging/oma-dm-agent.service
@@ -1,13 +1,9 @@
 [Unit]
 Description=OMA DM
-After=tizen-runtime.target
-Requires=tizen-runtime.target
 
 [Service]
-Type=forking
-EnvironmentFile=/run/tizen-mobile-env
-ExecStart=/etc/rc.d/init.d/oma-dm start
-ExecStop=/etc/rc.d/init.d/oma-dm stop
+EnvironmentFile=/etc/sysconfig/tizen-mobile-ui
+ExecStart=/usr/bin/oma-dm-agent booting
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/oma-dm-agent.spec b/packaging/oma-dm-agent.spec
index 5faa95d..60034b3 100644 (file)
--- a/packaging/oma-dm-agent.spec
+++ b/packaging/oma-dm-agent.spec
@@ -125,14 +125,6 @@ rm -rf %{buildroot}
 ##  Vconf setting... end
 ###############################################################################################################
 
-#/etc/init.d/oma-dm start
-
-
-
-%preun
-/etc/init.d/oma-dm stop
-
-
 %postun
 
 rm -f /tmp/agent_fw_event_omadm*
@@ -169,7 +161,6 @@ rm -rf /usr/share/oma-dm-cfg
 /usr/share/oma-dm-cfg/csc-setting/change_csc_value.sh
 /usr/share/oma-dm-cfg/imei-setting/change_imei_callnum.sh
 
-/etc/init.d/oma-dm
 %{_libdir}/systemd/system/oma-dm-agent.service
 %{_libdir}/systemd/system/multi-user.target.wants/oma-dm-agent.service
 

diff --git a/src/agent/CMakeLists.txt b/src/agent/CMakeLists.txt
index ee6f488..5219bf7 100644 (file)
--- a/src/agent/CMakeLists.txt
+++ b/src/agent/CMakeLists.txt
@@ -80,8 +80,5 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/oma-dm-cfg DESTINATION /usr/share)
 # install oma ds dbus file
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.omadmagent.service DESTINATION /usr/share/dbus-1/services)
 
-# install booting script file
-INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/${PROJECT_NAME} DESTINATION /etc/init.d/)
-
 # install smack rule file
 Install(FILES ${CMAKE_SOURCE_DIR}/oma-dm-agent.rule DESTINATION /etc/smack/accesses2.d)