From: Mike Yuan Date: Sun, 26 May 2024 02:33:59 +0000 (+0800) Subject: run: also show a pretty string for main exit status, if any X-Git-Tag: v256-rc4~122 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fbb637ac9b514bfdf62086cf40c53b7aded44cb;p=thirdparty%2Fsystemd.git run: also show a pretty string for main exit status, if any This brings output on par with unit_log_process_exit(). --- diff --git a/src/run/run.c b/src/run/run.c index 3732945a2ed..368952b82f3 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -1882,12 +1882,13 @@ static int start_transient_service(sd_bus *bus) { if (!isempty(c.result)) log_info("Finished with result: %s", strna(c.result)); - if (c.exit_code == CLD_EXITED) - log_info("Main processes terminated with: code=%s/status=%u", - sigchld_code_to_string(c.exit_code), c.exit_status); - else if (c.exit_code > 0) - log_info("Main processes terminated with: code=%s/status=%s", - sigchld_code_to_string(c.exit_code), signal_to_string(c.exit_status)); + if (c.exit_code > 0) + log_info("Main processes terminated with: code=%s, status=%u/%s", + sigchld_code_to_string(c.exit_code), + c.exit_status, + strna(c.exit_code == CLD_EXITED ? + exit_status_to_string(c.exit_status, EXIT_STATUS_FULL) : + signal_to_string(c.exit_status))); if (timestamp_is_set(c.inactive_enter_usec) && timestamp_is_set(c.inactive_exit_usec) &&