From 1d386094e4f993c5cd5ffcf0a1089cad156c4586 Mon Sep 17 00:00:00 2001
From: minsoo kim <ms203.kim@samsung.com>
Date: Mon, 3 Jul 2017 14:04:22 +0900
Subject: [PATCH] crash-worker: add supplementarygroups log systemd-journal

To gather dlog, journal log, add supplementarygroups to service
But dbus activation not applied suppplementarygroup,
So rearrange service role

org.tizen.system.crash.service : dbus activation
log_dump.service : log_dump daemon

Change-Id: I93e2bb5142a83f6dfa9ad56197916855988501ee
Signed-off-by: minsoo kim <ms203.kim@samsung.com>
---
 packaging/crash-worker.spec                 |  1 +
 src/log_dump/CMakeLists.txt                 | 10 ++++++++--
 src/log_dump/log_dump.service.m4            | 16 ++++++++++++++++
 src/log_dump/org.tizen.system.crash.service |  4 ++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 src/log_dump/log_dump.service.m4
 create mode 100644 src/log_dump/org.tizen.system.crash.service

diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec
index 28bf7fe..2ebc8df 100644
--- a/packaging/crash-worker.spec
+++ b/packaging/crash-worker.spec
@@ -177,6 +177,7 @@ sed -i "/${pattern}/D" %{_sysconfdir}/ld.so.preload
 %dir %{crash_all_log}
 %{crash_dump_gen}/*
 %attr(0750,system_fw,system_fw) %{_bindir}/*
+%attr(0644,system_fw,system_share) %{_unitdir}/log_dump.service
 %attr(0644,root,system) %{_unitdir}/tizen-debug-on.service
 %attr(0644,root,system) %{_unitdir}/tizen-debug-off.service
 %{TZ_SYS_ETC}/crash-manager.conf
diff --git a/src/log_dump/CMakeLists.txt b/src/log_dump/CMakeLists.txt
index 46af7ef..0cac32e 100644
--- a/src/log_dump/CMakeLists.txt
+++ b/src/log_dump/CMakeLists.txt
@@ -33,13 +33,19 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${LOG_DUMP_SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${log_dump_pkgs_LDFLAGS} -pie)
 
 PROCESS_M4("${M4_DEFINES}"
-	"${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.system.crash.service.m4"
-	"${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.system.crash.service")
+	"${CMAKE_CURRENT_SOURCE_DIR}/log_dump.service.m4"
+	"${CMAKE_CURRENT_SOURCE_DIR}/log_dump.service")
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.system.crash.service
 	DESTINATION /usr/share/dbus-1/system-services)
+
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/log_dump.conf
 	DESTINATION /etc/dbus-1/system.d)
+
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/log_dump.service DESTINATION /usr/lib/systemd/system
+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+        GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin
 		PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
 		GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
diff --git a/src/log_dump/log_dump.service.m4 b/src/log_dump/log_dump.service.m4
new file mode 100644
index 0000000..3e31e3d
--- /dev/null
+++ b/src/log_dump/log_dump.service.m4
@@ -0,0 +1,16 @@
+[Unit]
+Description=log_dump service
+
+[Service]
+SmackProcessLabel=System
+Type=oneshot
+Nice=-5
+KillMode=process
+ExecStart=/usr/bin/log_dump --dbus
+m4_ifdef('USE_ENGINEER_MODE',
+User=root
+Group=root,
+User=system_fw
+Group=system_fw
+)
+SupplementaryGroups=log systemd-journal
diff --git a/src/log_dump/org.tizen.system.crash.service b/src/log_dump/org.tizen.system.crash.service
new file mode 100644
index 0000000..5dfa56b
--- /dev/null
+++ b/src/log_dump/org.tizen.system.crash.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.tizen.system.crash
+Exec=/bin/false
+SystemdService=log_dump.service
-- 
2.7.4