diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/core/main.c | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index bb196f5414..7794541964 100644 --- a/configure.ac +++ b/configure.ac @@ -838,7 +838,7 @@ AC_DEFINE_UNQUOTED(TELINIT, ["$TELINIT"], [Path to telinit]) AC_SUBST(TELINIT) -AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h]) +AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h valgrind/valgrind.h]) # ------------------------------------------------------------------------------ have_myhostname=no diff --git a/src/core/main.c b/src/core/main.c index f342cdd289..4d4f6e8f4c 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -32,6 +32,10 @@ #include <sys/prctl.h> #include <sys/mount.h> +#ifdef HAVE_VALGRIND_VALGRIND_H +#include <valgrind/valgrind.h> +#endif + #include "sd-daemon.h" #include "sd-messages.h" #include "sd-bus.h" @@ -1830,6 +1834,15 @@ finish: if (fds) fdset_free(fds); +#ifdef HAVE_VALGRIND_VALGRIND_H + /* If we are PID 1 and running under valgrind, then let's exit + * here explicitly. valgrind will only generate nice output on + * exit(), not on exec(), hence let's do the former not the + * latter here. */ + if (getpid() == 1 && RUNNING_ON_VALGRIND) + return 0; +#endif + if (shutdown_verb) { const char * command_line[] = { SYSTEMD_SHUTDOWN_BINARY_PATH, |