From: Anita Zhang <the.anitazha@gmail.com>
Date: Fri, 5 Mar 2021 03:56:16 +0000 (-0800)
Subject: shutdown: set always_reopen_console
X-Git-Tag: v249-rc1~511^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f975f1cc748929942188ae1490cf8480f8a64877;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index 0d07865542e..c1fdc885afb 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;