From a504223d9a448ab338e369997c39c04067c8f906 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 13 Jul 2012 14:44:52 +0200 Subject: [PATCH 1/1] 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. --- src/core/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; -- 2.30.2