shutdown: print the standard wall message even when the user provided one

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 045203383de7c55960b07ba158bb33f66ea98472..76a094383237922510da0658b9b8971feced3896 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1033,6 +1033,8 @@ int main(int argc, char *argv[]) {
 
         program_invocation_short_name = systemd;
         prctl(PR_SET_NAME, systemd);
+        saved_argv = argv;
+        saved_argc = argc;
 
         log_show_color(isatty(STDERR_FILENO) > 0);
         log_show_location(false);
@@ -1061,7 +1063,7 @@ int main(int argc, char *argv[]) {
                 }
         } else {
                 arg_running_as = MANAGER_USER;
-                log_set_target(LOG_TARGET_CONSOLE);
+                log_set_target(LOG_TARGET_AUTO);
         }
 
         if (set_default_unit(SPECIAL_DEFAULT_TARGET) < 0)