mirror of
https://gitlab.freedesktop.org/plymouth/plymouth.git
synced 2026-05-08 18:18:05 +02:00
main: Always translate tty0 to tty1
Another bug in check_for_consoles...
We can't ever write to tty0 directly, because
it is redirected (just like /dev/console). Previously
we would translate the call to tty1, but commit
c40fd792b6
broke that. This commit fixes it again.
This commit is contained in:
parent
ba5054cc77
commit
cd0b866222
1 changed files with 7 additions and 6 deletions
13
src/main.c
13
src/main.c
|
|
@ -1784,6 +1784,12 @@ check_for_consoles (state_t *state,
|
|||
if (end != NULL)
|
||||
*end = '\0';
|
||||
|
||||
if (strcmp (console, "tty0") == 0 || strcmp (console, "/dev/tty0") == 0)
|
||||
{
|
||||
free (console);
|
||||
console = strdup (default_tty);
|
||||
}
|
||||
|
||||
ply_trace ("serial console %s found!", console);
|
||||
ply_hashtable_insert (consoles, console, NULL);
|
||||
|
||||
|
|
@ -1794,12 +1800,7 @@ check_for_consoles (state_t *state,
|
|||
state->kernel_console_tty = NULL;
|
||||
|
||||
if (console != NULL)
|
||||
{
|
||||
if (strcmp (console, "tty0") == 0 || strcmp (console, "/dev/tty0") == 0)
|
||||
state->kernel_console_tty = strdup (default_tty);
|
||||
else
|
||||
state->kernel_console_tty = strdup (console);
|
||||
}
|
||||
state->kernel_console_tty = strdup (console);
|
||||
|
||||
if (should_add_displays)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue