summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Szyndela <adrian.s@samsung.com>2016-06-23 10:15:02 +0200
committerTaeyoung Kim <ty317.kim@samsung.com>2016-06-23 03:41:03 -0700
commit227769dbbbbb3dcc8838bebba23141188d145b5a (patch)
treea06e35d00a35edd8fe81e2427dd738b0ad275cc0
parenta6e0e975c5011a6874f66948c15aa953e1cf5e4e (diff)
downloadcrash-worker-227769dbbbbb3dcc8838bebba23141188d145b5a.tar.gz
crash-worker-227769dbbbbb3dcc8838bebba23141188d145b5a.tar.bz2
crash-worker-227769dbbbbb3dcc8838bebba23141188d145b5a.zip
Additionally: made explicit libebl dependency in spec file. Libebl backends are loaded with dlopen() by libelf. Thus, rpm can't find the dependency automatically. Change-Id: Ic0abe5d0eff701afb316f398b142fecb22029423 Signed-off-by: Adrian Szyndela <adrian.s@samsung.com>
-rw-r--r--packaging/crash-worker.spec1
-rw-r--r--src/crash-manager/crash-manager.sh.in5
2 files changed, 5 insertions, 1 deletions
diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec
index 6fe277a..aacf5bf 100644
--- a/packaging/crash-worker.spec
+++ b/packaging/crash-worker.spec
@@ -16,6 +16,7 @@ BuildRequires: libdw-devel libdw
Requires(post): coreutils
Requires(post): tar
Requires(post): gzip
+Requires: libebl
%description
crash-manager
diff --git a/src/crash-manager/crash-manager.sh.in b/src/crash-manager/crash-manager.sh.in
index d99056c..b3ed342 100644
--- a/src/crash-manager/crash-manager.sh.in
+++ b/src/crash-manager/crash-manager.sh.in
@@ -23,13 +23,16 @@ pfx="${temp_dir}/${name}"
info_path="${pfx}/${name}.info"
core_path="${pfx}/${name}.coredump"
log_path="${pfx}/${name}.log"
+tmp_callstack_path="${pfx}/${name}.callstack"
mkdir -p "$CRASH_PATH" "$pfx"
if [ $DEBUG -eq 1 ]
then
+ @CRASH_STACK_PATH@ --pid "$pid" > "$tmp_callstack_path"
@CRASH_PIPE_PATH@ --save-core "$core_path" --report "$@" > "$info_path"
- @CRASH_STACK_PATH@ "$core_path" >> "$info_path"
+ cat "$tmp_callstack_path" >> "$info_path"
+ rm "$tmp_callstack_path"
else
@CRASH_PIPE_PATH@ --report "$@" > "$info_path"
@CRASH_STACK_PATH@ --pid "$pid" >> "$info_path"