Always restart iotcon-daemon

Change-Id: I022eea1b76d27eae469fd6e4e77f40112d0e66eb
Signed-off-by: youngman <yman.jung@samsung.com>

diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index 9c554b89706a29283adb28670dbe74a35fe14a31..d1c504fdd7b6464c68aeb34c7376b8a2de104663 100644 (file)
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -28,7 +28,3 @@ TARGET_LINK_LIBRARIES(${DAEMON}
 )
 
 INSTALL(TARGETS ${DAEMON} DESTINATION ${BIN_INSTALL_DIR})
-
-SET(DBUS_SERVICE_FILE "org.tizen.${PROJECT_NAME}.dbus")
-CONFIGURE_FILE(${DBUS_SERVICE_FILE}.service.in ${DBUS_SERVICE_FILE}.service @ONLY)
-INSTALL(FILES ${DBUS_SERVICE_FILE}.service DESTINATION ${SHARE_INSTALL_PREFIX}/dbus-1/services)

diff --git a/daemon/org.tizen.iotcon.dbus.service.in b/daemon/org.tizen.iotcon.dbus.service.in
deleted file mode 100644 (file)
index cb3f2a2..0000000
--- a/daemon/org.tizen.iotcon.dbus.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=@DBUS_INTERFACE@
-Exec=@BIN_INSTALL_DIR@/@DAEMON@
\ No newline at end of file

diff --git a/packaging/iotcon.service b/packaging/iotcon.service
index 3a463e7293cb08db8846cb81d6ec05734924a747..92b1622a0b9ff9be76c37b92f946bdeb4fb843f1 100644 (file)
--- a/packaging/iotcon.service
+++ b/packaging/iotcon.service
@@ -1,12 +1,10 @@
 [Unit]
 Description=Tizen IoT Connectivity
-After=system-server.service
-Requires=system-server.service
 
 [Service]
 Type=simple
 ExecStart=/usr/bin/iotcon-daemon
-KillSignal=SIGKILL
+Restart=always
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/iotcon.spec b/packaging/iotcon.spec
index 0a76e8fca79fe8ff1a32ca2160beceab79b1f2a0..ed1a66603cc8e29592c5502856d30a91a61a8188 100644 (file)
--- a/packaging/iotcon.spec
+++ b/packaging/iotcon.spec
@@ -120,7 +120,6 @@ systemctl daemon-reload
 %{_unitdir}/%{name}.service
 %{_unitdir}/multi-user.target.wants/%{name}.service
 %{_bindir}/%{name}-daemon
-%{_datadir}/dbus-1/services/org.tizen.%{name}.dbus.service
 %if 0%{?tizen_version_major} < 3
 %{_datadir}/license/%{name}
 %else