From: Keebum Kim <keebum.kim@samsung.com>
Date: Wed, 5 Jun 2013 07:55:22 +0000 (+0900)
Subject: Modify systemd related.
X-Git-Tag: submit/tizen_2.2/20130714.152008~11^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17b25d263fb010b4df5fa636e98d7ac79dea5457;p=framework%2Fmessaging%2Fmsg-service.git

Modify systemd related.

Change-Id: I56f905993c519d66746e50bfb387cb02db38941e
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d48e3f5..80f7df6 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,6 @@ SET(RC_LOCAL_SCRIPT msg-server)
 INSTALL(PROGRAMS ${RC_LOCAL_SCRIPT} DESTINATION /etc/rc.d/init.d)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/packaging/msg-service.service DESTINATION /usr/lib/systemd/system)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/packaging/msg-service-log.service DESTINATION /usr/lib/systemd/system)
 
 # LICENSE file
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.Flora DESTINATION /usr/share/license/msg-service)
diff --git a/msg-server b/msg-server
index 0c9ab19..394be13 100755
--- a/msg-server
+++ b/msg-server
@@ -1,7 +1,9 @@
 #!/bin/sh
 ## A script for running msg-server in booting time.
 
-if [ ! -e /opt/etc/.hib_capturing ]; then
+# log
+#dlogutil -v threadtime -f /var/log/msgfw/msgfw.log -r 1000 -n 10 MSG_SERVICE &
+
+# msg-server
 /usr/bin/msg-server &
-fi
 
diff --git a/packaging/msg-service-log.service b/packaging/msg-service-log.service
deleted file mode 100755
index 1dd6228..0000000
--- a/packaging/msg-service-log.service
+++ /dev/null
@@ -1,9 +0,0 @@
-
-[Unit]
-Description=Start the msg-server dlog
-
-[Service]
-ExecStart=/usr/bin/dlogutil -v threadtime -f /var/log/msgfw/msgfw.log -r 1000 -n 10 MSG_SERVICE
-
-[Install]
-WantedBy=tizen-middleware.target
\ No newline at end of file
diff --git a/packaging/msg-service.service b/packaging/msg-service.service
index 4b8fb54..24b19c0 100755
--- a/packaging/msg-service.service
+++ b/packaging/msg-service.service
@@ -3,7 +3,8 @@
 Description=Start the msg-server
 
 [Service]
-ExecStart=/usr/bin/msg-server
+Type=forking
+ExecStart=/etc/rc.d/init.d/msg-server
 Nice=5
 OOMScoreAdjust=-100
 Restart=always
diff --git a/packaging/msg-service.spec b/packaging/msg-service.spec
index c0534ee..493bff1 100755
--- a/packaging/msg-service.spec
+++ b/packaging/msg-service.spec
@@ -111,9 +111,7 @@ mkdir -p %{buildroot}/var/log/msgfw
 %make_install
 
 mkdir -p %{buildroot}/usr/lib/systemd/system/network.target.wants
-#install -m 0644 %SOURCE101 %{buildroot}/usr/lib/systemd/user/
 ln -s ../msg-service.service %{buildroot}/usr/lib/systemd/system/network.target.wants/msg-service.service
-ln -s ../msg-service-log.service %{buildroot}/usr/lib/systemd/system/network.target.wants/msg-service-log.service
 
 mkdir -p  %{buildroot}%{_sysconfdir}/rc.d/rc3.d
 ln -s %{_sysconfdir}/rc.d/init.d/msg-server  %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S70msg-server
@@ -540,9 +538,7 @@ fi
 %{_sysconfdir}/rc.d/rc3.d/S70msg-server
 %{_sysconfdir}/rc.d/rc5.d/S70msg-server
 /usr/lib/systemd/system/msg-service.service
-/usr/lib/systemd/system/msg-service-log.service
 /usr/lib/systemd/system/network.target.wants/msg-service.service
-/usr/lib/systemd/system/network.target.wants/msg-service-log.service
 /usr/share/license/msg-service/LICENSE.Flora
 /opt/etc/smack/accesses.d/msg-service.rule
 /etc/config/sysinfo-message.xml