From: Karol Lewandowski Date: Mon, 24 Apr 2017 15:34:18 +0000 (+0200) Subject: Removing dependency of tizen-debug-on/off service from sys-assert X-Git-Tag: submit/tizen/20170425.080615^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b4b8a8872ef212a6bbe5ef4ac1444df880fa39f;p=platform%2Fcore%2Fsystem%2Fcrash-worker.git Removing dependency of tizen-debug-on/off service from sys-assert Tizen-debug-on/off service should control enabling/disabling coredump generation. When Tizen-debug-off service is executed, only callstack should be generated. Thus, although disabling sys-assert, the services should be remained. TODO : For disabling sys-assert, the services should be changed properly. Change-Id: I617356cd31b51dbe4f103cb3118fefe454e717db --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a3ca59d3..6982d260 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,5 +17,6 @@ ENDIF() ADD_SUBDIRECTORY(src/dump_systemstate) ADD_SUBDIRECTORY(src/log_dump) +ADD_SUBDIRECTORY(data) ADD_SUBDIRECTORY(tests) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt new file mode 100644 index 00000000..91a31e5a --- /dev/null +++ b/data/CMakeLists.txt @@ -0,0 +1,7 @@ +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tizen-debug-on.service DESTINATION /usr/lib/systemd/system + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tizen-debug-off.service DESTINATION /usr/lib/systemd/system + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) diff --git a/data/tizen-debug-off.service b/data/tizen-debug-off.service new file mode 100644 index 00000000..870964ed --- /dev/null +++ b/data/tizen-debug-off.service @@ -0,0 +1,15 @@ +[Unit] +Description=tizen debug off +DefaultDependencies=no +After=opt.mount tizen-debug-on.service +Before=sysinit.target + +[Service] +SmackProcessLabel=System +Type=oneshot +RemainAfterExit=yes +ExecStart=/bin/rm -f /opt/etc/.debugmode +ExecStart=/sbin/sysctl kernel.core_pattern=/dev/null + +[Install] +WantedBy=sysinit.target diff --git a/data/tizen-debug-on.service b/data/tizen-debug-on.service new file mode 100644 index 00000000..22ae97a8 --- /dev/null +++ b/data/tizen-debug-on.service @@ -0,0 +1,15 @@ +[Unit] +Description=tizen debug on +DefaultDependencies=no +After=opt.mount +Before=sysinit.target + +[Service] +SmackProcessLabel=System +Type=oneshot +RemainAfterExit=yes +ExecStart=/bin/touch -f /opt/etc/.debugmode +ExecStart=/sbin/sysctl -p /usr/lib/sysctl.d/99-crash-manager.conf + +[Install] +WantedBy=sysinit.target diff --git a/src/sys-assert/CMakeLists.txt b/src/sys-assert/CMakeLists.txt index e6c7ca0a..99d3383a 100644 --- a/src/sys-assert/CMakeLists.txt +++ b/src/sys-assert/CMakeLists.txt @@ -62,11 +62,3 @@ INSTALL(TARGETS ${LIBNAME} LIBRARY DESTINATION ${LIB_INSTALL_DIR}) CONFIGURE_FILE(sys-assert.conf.in sys-assert.conf) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/sys-assert.conf DESTINATION ${TMP_FILES_DIR}) - -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tizen-debug-on.service DESTINATION /usr/lib/systemd/system - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tizen-debug-off.service DESTINATION /usr/lib/systemd/system - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) \ No newline at end of file diff --git a/src/sys-assert/tizen-debug-off.service b/src/sys-assert/tizen-debug-off.service deleted file mode 100644 index 870964ed..00000000 --- a/src/sys-assert/tizen-debug-off.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=tizen debug off -DefaultDependencies=no -After=opt.mount tizen-debug-on.service -Before=sysinit.target - -[Service] -SmackProcessLabel=System -Type=oneshot -RemainAfterExit=yes -ExecStart=/bin/rm -f /opt/etc/.debugmode -ExecStart=/sbin/sysctl kernel.core_pattern=/dev/null - -[Install] -WantedBy=sysinit.target diff --git a/src/sys-assert/tizen-debug-on.service b/src/sys-assert/tizen-debug-on.service deleted file mode 100644 index 22ae97a8..00000000 --- a/src/sys-assert/tizen-debug-on.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=tizen debug on -DefaultDependencies=no -After=opt.mount -Before=sysinit.target - -[Service] -SmackProcessLabel=System -Type=oneshot -RemainAfterExit=yes -ExecStart=/bin/touch -f /opt/etc/.debugmode -ExecStart=/sbin/sysctl -p /usr/lib/sysctl.d/99-crash-manager.conf - -[Install] -WantedBy=sysinit.target