From 499bea62091f7b672f0e296ec67623a155e2a1d6 Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Thu, 4 Mar 2021 19:56:16 -0800 Subject: [PATCH] shutdown: set always_reopen_console Back in v232 systemd-shutdown would log to /dev/console. However after the addition of always_reopen_console (v233) it would log to STDERR. This caused some debugging issues as container systemd-shutdown logs weren't being logged to console as the arg `--log-target=console` suggested. Since it appears that always_reopen_console was intended for pid1, set it in systemd-shutdown as well so logs will go to /dev/console. (cherry picked from commit f975f1cc748929942188ae1490cf8480f8a64877) (cherry picked from commit baa8bd89efa752633805c5b04b02d1dbde5ea0bb) --- src/shutdown/shutdown.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c index 0d07865542..c1fdc885af 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c @@ -322,6 +322,9 @@ int main(int argc, char *argv[]) { log_set_prohibit_ipc(true); log_parse_environment(); + if (getpid_cached() == 1) + log_set_always_reopen_console(true); + r = parse_argv(argc, argv); if (r < 0) goto error; -- 2.25.1