Normalize minicoredumper config variable naming

Change-Id: I5669d0d46fc15c8193b5e8ea11d1254838a8dfd1

diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec
index d19aaf9..9aad40e 100644 (file)
--- a/packaging/crash-worker.spec
+++ b/packaging/crash-worker.spec
@@ -108,8 +108,8 @@ export CFLAGS+=" -Werror"
           -DCRASH_PATH=%{crash_path} \
           -DCRASH_TEMP=%{crash_temp} \
           -DDEBUGMODE_PATH=%{debugmode_path} \
-          -DMINICOREDUMPER_PATH=%{_sbindir}/minicoredumper \
-          -DMINICOREDUMPER_CONF_DIR=%{_sysconfdir}/minicoredumper \
+          -DMINICOREDUMPER_BIN_PATH=%{_sbindir}/minicoredumper \
+          -DMINICOREDUMPER_CONFIG_PATH=%{_sysconfdir}/minicoredumper/minicoredumper.cfg.json \
           -DCRASH_STACK_PATH=%{_libexecdir}/crash-stack \
           -DCRASH_TESTS_PATH=%{_libdir}/crash-worker-tests \
           -DSYS_ASSERT=%{on_off sys_assert} \

diff --git a/src/crash-manager/crash-manager.c b/src/crash-manager/crash-manager.c
index 96802b3..b04d7e2 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 MINICOREDUMPER_CONF_FILE       MINICOREDUMPER_CONF_DIR "/minicoredumper.cfg.json"
 #define KEY_MAX              255
 #define CRASH_SECTION        "CrashManager"
 
@@ -789,7 +788,7 @@ static int execute_minicoredump(int argc, char *argv[])
 
        /* Execute minicoredumper */
        char *args[] = {
-                       MINICOREDUMPER_PATH,       // minicoredumper filename path
+                       MINICOREDUMPER_BIN_PATH,   // minicoredumper filename path
                        crash_info.pid_info,       // %p - pid
                        argv[2],                   // %u - UID
                        argv[3],                   // %g - GID
@@ -797,7 +796,7 @@ static int execute_minicoredump(int argc, char *argv[])
                        argv[5],                   // %t - time of dump
                        "localhost",               // %h - hostname
                        "core",                    // %e - exe name (need for result filename)
-                       MINICOREDUMPER_CONF_FILE,  // config file
+                       MINICOREDUMPER_CONFIG_PATH, // config file
                        "-d",
                        crash_info.pfx,            // temp dir
                        "-o",

diff --git a/src/crash-manager/crash-manager.h.in b/src/crash-manager/crash-manager.h.in
index dbcd051..f5a8c4b 100644 (file)
--- a/src/crash-manager/crash-manager.h.in
+++ b/src/crash-manager/crash-manager.h.in
@@ -26,8 +26,8 @@
 #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 MINICOREDUMPER_BIN_PATH "@MINICOREDUMPER_BIN_PATH@"
+#define MINICOREDUMPER_CONFIG_PATH "@MINICOREDUMPER_CONFIG_PATH@"
 #define DEBUGMODE_PATH   "@DEBUGMODE_PATH@"
 
 #endif