diff options
| author | Karol Lewandowski <k.lewandowsk@samsung.com> | 2018-08-22 10:53:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2018-08-22 10:53:19 +0000 |
| commit | 33091053e73fb47f853f7aa9bc675f8f1dbc28be (patch) | |
| tree | c53a46cbbc79cb565827cdb763ebb87955a10ce2 | |
| parent | 091b5a128c21db104c127c3bd2fb146a0649dad3 (diff) | |
| parent | 07d2d52b278417f7abb867315d5d96beb5885eb8 (diff) | |
| download | crash-worker-33091053e73fb47f853f7aa9bc675f8f1dbc28be.tar.gz crash-worker-33091053e73fb47f853f7aa9bc675f8f1dbc28be.tar.bz2 crash-worker-33091053e73fb47f853f7aa9bc675f8f1dbc28be.zip | |
Merge changes I5ecf4873,I049952ab into tizen
* changes:
log_dump: dbus: Only root can own org.tizen.system.crash name
log_dump: Rework service file
| -rw-r--r-- | packaging/crash-worker.spec | 3 | ||||
| -rw-r--r-- | src/log_dump/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/log_dump/log_dump.conf | 1 | ||||
| -rw-r--r-- | src/log_dump/log_dump.service.m4 | 16 |
4 files changed, 5 insertions, 19 deletions
diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index 92eac66..958f558 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -91,7 +91,6 @@ This package contains installable tests in Bash. cp %{SOURCE1001} . export CFLAGS+=" -Werror" -export CFLAGS+=" -DTIZEN_ENGINEER_MODE" %ifarch %{arm} aarch64 %define ARCH arm @@ -190,7 +189,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 +%{_unitdir}/log_dump.service %{TZ_SYS_ETC}/crash-manager.conf %attr(-,root,root) %{_sysconfdir}/dbus-1/system.d/log_dump.conf %attr(-,root,root) %{_prefix}/lib/sysctl.d/99-crash-manager.conf diff --git a/src/log_dump/CMakeLists.txt b/src/log_dump/CMakeLists.txt index 0cac32e..fcceff5 100644 --- a/src/log_dump/CMakeLists.txt +++ b/src/log_dump/CMakeLists.txt @@ -24,10 +24,6 @@ ENDFOREACH(flag) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE") -IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_ENGINEER_MODE") - SET(M4_DEFINES ${M4_DEFINES} -DUSE_ENGINEER_MODE) -ENDIF() - CONFIGURE_FILE(log_dump.h.in log_dump.h @ONLY) ADD_EXECUTABLE(${PROJECT_NAME} ${LOG_DUMP_SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${log_dump_pkgs_LDFLAGS} -pie) diff --git a/src/log_dump/log_dump.conf b/src/log_dump/log_dump.conf index 8674f46..4c82d0e 100644 --- a/src/log_dump/log_dump.conf +++ b/src/log_dump/log_dump.conf @@ -11,7 +11,6 @@ send_member="delete_dump"/> </policy> <policy user="system"> - <allow own="org.tizen.system.crash"/> <allow send_destination="org.tizen.system.crash" send_interface="org.tizen.system.crash.Crash" send_member="dump_log"/> diff --git a/src/log_dump/log_dump.service.m4 b/src/log_dump/log_dump.service.m4 index 07b024c..be46f63 100644 --- a/src/log_dump/log_dump.service.m4 +++ b/src/log_dump/log_dump.service.m4 @@ -2,18 +2,10 @@ Description=log_dump service [Service] +Type=dbus +BusName=org.tizen.system.crash +ExecStart=/usr/bin/log_dump --dbus SmackProcessLabel=System -Type=oneshot +SupplementaryGroups=log systemd-journal 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 -SecureBits=keep-caps -Capabilities=cap_sys_ptrace=eip -CapabilityBoundingSet=CAP_SYS_PTRACE -) -SupplementaryGroups=log systemd-journal |