1
0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00

Revert "pid1: reconnect to the console before being re-executed"

This reverts commit affd7ed1a9.

> So it looks like make_console_stdio() has bad side effect. More specifically it
> does a TIOCSCTTY ioctl (via acquire_terminal()) which sees to disturb the
> process which was using/owning the console.

Fixes #3842.
https://bugs.debian.org/834367
https://bugzilla.redhat.com/show_bug.cgi?id=1367766
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-08-18 21:39:39 -04:00
parent 206fc4b284
commit bd64d82c1c

View File

@ -2014,9 +2014,6 @@ finish:
log_error_errno(r, "Failed to switch root, trying to continue: %m");
}
/* Reopen the console */
(void) make_console_stdio();
args_size = MAX(6, argc+1);
args = newa(const char*, args_size);
@ -2064,6 +2061,9 @@ finish:
arg_serialization = safe_fclose(arg_serialization);
fds = fdset_free(fds);
/* Reopen the console */
(void) make_console_stdio();
for (j = 1, i = 1; j < (unsigned) argc; j++)
args[i++] = argv[j];
args[i++] = NULL;