diff options
-rw-r--r-- | abrt.spec | 2 | ||||
-rw-r--r-- | doc/implementation | 6 | ||||
-rw-r--r-- | lib/plugins/CCpp.cpp | 10 | ||||
-rw-r--r-- | src/daemon/Makefile.am | 6 | ||||
-rwxr-xr-x | src/daemon/abrt-action-install-debuginfo (renamed from src/daemon/abrt-debuginfo-install) | 4 |
5 files changed, 15 insertions, 13 deletions
@@ -351,7 +351,7 @@ fi %{_sbindir}/abrt-server %{_sbindir}/abrt-action-generate-backtrace %{_sbindir}/abrt-action-save-package-data -%{_bindir}/%{name}-debuginfo-install +%{_bindir}/abrt-action-install-debuginfo %{_bindir}/%{name}-handle-upload %{_bindir}/%{name}-backtrace %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf diff --git a/doc/implementation b/doc/implementation index 72f12c72..e749a47d 100644 --- a/doc/implementation +++ b/doc/implementation @@ -72,11 +72,11 @@ getReport(UUID) method or automatically if admin sets it in /etc/abrt/abrt.conf if it does then: b) daemon tries to install the debuginfo issuing this command: -execlp("abrt-debuginfo-install", "abrt-debuginfo-install", coredump, tempdir, debuginfo_dirs, NULL); +execlp("abrt-action-install-debuginfo", "abrt-action-install-debuginfo", coredump, tempdir, debuginfo_dirs, NULL); -abrt-debuginfo-install is a shell script using elfutils to get build-ids from coredump and the use +abrt-action-install-debuginfo is a shell script using elfutils to get build-ids from coredump and the use "yum provides" and "yumdownloader" to determine and download the missing debuginfo packages -* script source code: http://git.fedorahosted.org/git/abrt.git?p=abrt.git;a=blob_plain;f=src/Daemon/abrt-debuginfo-install +* script source code: http://git.fedorahosted.org/git/abrt.git?p=abrt.git;a=blob_plain;f=src/Daemon/abrt-action-install-debuginfo c) run gdb and get backtrace from coredump: see http://git.fedorahosted.org/git/abrt.git?p=abrt.git;a=blob_plain;f=lib/Plugins/CCpp.cpp line 260 - gdb is run with the same privileges as the crashed app (setregid, setreuid) diff --git a/lib/plugins/CCpp.cpp b/lib/plugins/CCpp.cpp index 041c85b8..a83a2b23 100644 --- a/lib/plugins/CCpp.cpp +++ b/lib/plugins/CCpp.cpp @@ -259,11 +259,11 @@ static char *install_debug_infos(const char *pDebugDumpDir, const char *debuginf /* SELinux guys are not happy with /tmp, using /var/run/abrt */ char *tempdir = xasprintf(LOCALSTATEDIR"/run/abrt/tmp-%lu-%lu", (long)getpid(), (long)time(NULL)); /* log() goes to stderr/syslog, it's ok to use it here */ - VERB1 log("Executing: %s %s %s %s", "abrt-debuginfo-install", coredump, tempdir, debuginfo_dirs); + VERB1 log("Executing: %s %s %s %s", "abrt-action-install-debuginfo", coredump, tempdir, debuginfo_dirs); /* We want parent to see errors in the same stream */ xdup2(STDOUT_FILENO, STDERR_FILENO); - execlp("abrt-debuginfo-install", "abrt-debuginfo-install", coredump, tempdir, debuginfo_dirs, NULL); - perror_msg("Can't execute '%s'", "abrt-debuginfo-install"); + execlp("abrt-action-install-debuginfo", "abrt-action-install-debuginfo", coredump, tempdir, debuginfo_dirs, NULL); + perror_msg("Can't execute '%s'", "abrt-action-install-debuginfo"); /* Serious error (1 means "some debuginfos not found") */ exit(2); } @@ -317,11 +317,11 @@ static char *install_debug_infos(const char *pDebugDumpDir, const char *debuginf if (WIFEXITED(status)) { if (WEXITSTATUS(status) > 1) - error_msg("%s exited with %u", "abrt-debuginfo-install", (int)WEXITSTATUS(status)); + error_msg("%s exited with %u", "abrt-action-install-debuginfo", (int)WEXITSTATUS(status)); } else { - error_msg("%s killed by signal %u", "abrt-debuginfo-install", (int)WTERMSIG(status)); + error_msg("%s killed by signal %u", "abrt-action-install-debuginfo", (int)WTERMSIG(status)); } return strbuf_free_nobuf(buf_build_ids); diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index c03463bf..88da7a02 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -1,4 +1,6 @@ -bin_SCRIPTS = abrt-debuginfo-install abrt-handle-upload +bin_SCRIPTS = \ + abrt-action-install-debuginfo \ + abrt-handle-upload sbin_PROGRAMS = abrtd \ abrt-server \ @@ -111,7 +113,7 @@ dist_comredhatabrtservice_DATA = com.redhat.abrt.service man_MANS = abrtd.8 abrt.conf.5 -EXTRA_DIST = $(man_MANS) abrt-debuginfo-install abrt-handle-upload +EXTRA_DIST = $(man_MANS) abrt-action-install-debuginfo abrt-handle-upload if HAVE_SYSTEMD dist_systemdsystemunit_DATA = \ diff --git a/src/daemon/abrt-debuginfo-install b/src/daemon/abrt-action-install-debuginfo index 3a236b59..c1b8fdb9 100755 --- a/src/daemon/abrt-debuginfo-install +++ b/src/daemon/abrt-action-install-debuginfo @@ -9,7 +9,7 @@ # - debuginfo-install aborts if yum lock is busy # - pk-debuginfo-install was observed to hang # -# Usage: abrt-debuginfo-install CORE TEMPDIR [CACHEDIR[:DEBUGINFODIR1:DEBUGINFODIR2...]] +# Usage: abrt-action-install-debuginfo CORE TEMPDIR [CACHEDIR[:DEBUGINFODIR1:DEBUGINFODIR2...]] # If CACHEDIR is specified, debuginfos should be installed there. # If not, debuginfos should be installed into TEMPDIR. # @@ -63,7 +63,7 @@ else if test $# -lt 2 || test x"$1" = x"--help"; then echo "Usage:" echo - echo "abrt-debuginfo-install [-v] CORE TEMPDIR [CACHEDIR[:DEBUGINFODIR...]]" + echo "abrt-action-install-debuginfo [-v] CORE TEMPDIR [CACHEDIR[:DEBUGINFODIR...]]" echo echo "TEMPDIR must be a name of a new temporary directory. It must not exist." echo "If CACHEDIR is specified, debuginfos are installed in CACHEDIR," |