Move crash-manager.conf to /etc

This commit brings back config to /etc to avoid problems
with config not being available for crashes happening
during bootup (when /opt/ is not mounted yet)

Change-Id: Ib384f1fd28192dd199565d888c59f0a33d4d578d

diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec
index aebc135..d19aaf9 100644 (file)
--- a/packaging/crash-worker.spec
+++ b/packaging/crash-worker.spec
@@ -101,6 +101,7 @@ export CFLAGS+=" -Werror"
           -DTMP_FILES_DIR=%{_sysconfdir}/tmpfiles.d \
           -DARCH=%{ARCH} \
           -DARCH_BIT=%{ARCH_BIT} \
+          -DCRASH_MANAGER_CONFIG_PATH=%{_sysconfdir}/crash-manager.conf \
           -DTZ_SYS_ETC=%{TZ_SYS_ETC} \
           -DTZ_SYS_BIN=%{TZ_SYS_BIN} \
           -DCRASH_ROOT_PATH=%{crash_root_path} \
@@ -173,7 +174,7 @@ sed -i "/${pattern}/D" %{_sysconfdir}/ld.so.preload
 %{crash_dump_gen}/*
 %attr(0750,system_fw,system_fw) %{_bindir}/*
 %{_unitdir}/log_dump.service
-%{TZ_SYS_ETC}/crash-manager.conf
+%{_sysconfdir}/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
 %attr(-,root,root) %{_datadir}/dbus-1/system-services/org.tizen.system.crash.service

diff --git a/src/crash-manager/CMakeLists.txt b/src/crash-manager/CMakeLists.txt
index 1ad1f93..ee04dd0 100644 (file)
--- a/src/crash-manager/CMakeLists.txt
+++ b/src/crash-manager/CMakeLists.txt
@@ -43,7 +43,7 @@ ENDIF(USE_COREDUMP_CONF)
 
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}/crash-manager.conf
-               DESTINATION ${TZ_SYS_ETC}
+               DESTINATION /etc
                PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}/99-${PROJECT_NAME}.conf

diff --git a/src/crash-manager/crash-manager.c b/src/crash-manager/crash-manager.c
index 87b6756..96802b3 100644 (file)
--- a/src/crash-manager/crash-manager.c
+++ b/src/crash-manager/crash-manager.c
@@ -47,7 +47,6 @@
 #define LOG_TAG "CRASH_MANAGER"
 
 /* Parsing */
-#define CRASH_CONF_FILE      tzplatform_mkpath(TZ_SYS_ETC, "crash-manager.conf")
 #define MINICOREDUMPER_CONF_FILE       MINICOREDUMPER_CONF_DIR "/minicoredumper.cfg.json"
 #define KEY_MAX              255
 #define CRASH_SECTION        "CrashManager"
@@ -292,9 +291,9 @@ static int get_config(void)
        }
        report_type = REP_DEFAULT_TYPE;
 
-       ini = iniparser_load(CRASH_CONF_FILE);
+       ini = iniparser_load(CRASH_MANAGER_CONFIG_PATH);
        if (!ini) {
-               _E("Failed to load conf file %s", CRASH_CONF_FILE);
+               _E("Failed to load conf file %s", CRASH_MANAGER_CONFIG_PATH);
                return 0;
        }
 

diff --git a/src/crash-manager/crash-manager.h.in b/src/crash-manager/crash-manager.h.in
index 149a056..dbcd051 100644 (file)
--- a/src/crash-manager/crash-manager.h.in
+++ b/src/crash-manager/crash-manager.h.in
@@ -25,6 +25,7 @@
 #define CRASH_TEMP       "@CRASH_TEMP@"
 #define SYS_ASSERT       "@SYS_ASSERT@"
 #define CRASH_STACK_PATH "@CRASH_STACK_PATH@"
+#define CRASH_MANAGER_CONFIG_PATH "@CRASH_MANAGER_CONFIG_PATH@"
 #define MINICOREDUMPER_PATH  "@MINICOREDUMPER_PATH@"
 #define MINICOREDUMPER_CONF_DIR  "@MINICOREDUMPER_CONF_DIR@"
 #define DEBUGMODE_PATH   "@DEBUGMODE_PATH@"