From: Harald Hoyer <harald@redhat.com>
Date: Fri, 13 Jul 2012 12:44:52 +0000 (+0200)
Subject: main: only reopen /dev/console if we switch-root to a custom init
X-Git-Tag: v187~105
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a504223d9a448ab338e369997c39c04067c8f906;p=elogind.git

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 87cb4ffb5..ae3769be5 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1673,9 +1673,6 @@ finish:
                  * 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);
@@ -1733,6 +1730,9 @@ finish:
                         fds = NULL;
                 }
 
+                /* Reopen the console */
+                make_console_stdio();
+
                 for (j = 1, i = 1; j < argc; j++)
                         args[i++] = argv[j];
                 args[i++] = NULL;