main: only reopen /dev/console if we switch-root to a custom init

There's no point in reopening /dev/console if we reopen it anyway
afterwards.

diff --git a/src/core/main.c b/src/core/main.c
index 87cb4ff..ae3769b 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1673,9 +1673,6 @@ finish:
                  * rebooted while we do that */
                 watchdog_close(true);
 
                  * rebooted while we do that */
                 watchdog_close(true);
 

-                /* Reopen the console */
-                make_console_stdio();
-

                 if (switch_root_dir) {
                         /* Kill all remaining processes from the initrd */
                         broadcast_signal(SIGTERM);
                 if (switch_root_dir) {
                         /* Kill all remaining processes from the initrd */
                         broadcast_signal(SIGTERM);


@@ -1733,6 +1730,9 @@ finish:
                         fds = NULL;
                 }
 
                         fds = NULL;
                 }
 

+                /* Reopen the console */
+                make_console_stdio();
+

                 for (j = 1, i = 1; j < argc; j++)
                         args[i++] = argv[j];
                 args[i++] = NULL;
                 for (j = 1, i = 1; j < argc; j++)
                         args[i++] = argv[j];
                 args[i++] = NULL;