diff options
author | Lennart Poettering <lennart@poettering.net> | 2017-12-28 00:51:19 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-01-04 13:27:27 +0100 |
commit | 7d4904fe7a14852c1469a55ec1dfdf747d829cb1 (patch) | |
tree | 0436ef0382c15c9e020ec110dde9d79c44342517 /src/sulogin-shell | |
parent | process-util: add another fork_safe() flag for enabling LOG_ERR/LOG_WARN logging (diff) | |
download | systemd-7d4904fe7a14852c1469a55ec1dfdf747d829cb1.tar.xz systemd-7d4904fe7a14852c1469a55ec1dfdf747d829cb1.zip |
process-util: rework wait_for_terminate_and_warn() to take a flags parameter
This renames wait_for_terminate_and_warn() to
wait_for_terminate_and_check(), and adds a flags parameter, that
controls how much to log: there's one flag that means we log about
abnormal stuff, and another one that controls whether we log about
non-zero exit codes. Finally, there's a shortcut flag value for logging
in both cases, as that's what we usually use.
All callers are accordingly updated. At three occasions duplicate logging
is removed, i.e. where the old function was called but logged in the
caller, too.
Diffstat (limited to 'src/sulogin-shell')
-rw-r--r-- | src/sulogin-shell/sulogin-shell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c index e8839eae18..33dc07c5bd 100644 --- a/src/sulogin-shell/sulogin-shell.c +++ b/src/sulogin-shell/sulogin-shell.c @@ -93,7 +93,7 @@ static int fork_wait(const char* const cmdline[]) { _exit(EXIT_FAILURE); /* Operational error */ } - return wait_for_terminate_and_warn(cmdline[0], pid, false); + return wait_for_terminate_and_check(cmdline[0], pid, WAIT_LOG_ABNORMAL); } static void print_mode(const char* mode) { |