Commit a504223d authored by Harald Hoyer's avatar Harald Hoyer Committed by Lennart Poettering

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.
parent 910212e7
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment