fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-08 12:28:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device-manager: Don't add local console to terminals hash table unless passed on cmdline

Browse source 
it's unexpected for plymouth to show boot messages on the local console
if there is not console=tty0 on the kernel command line.

This commit fixes that.
This commit is contained in:
Ray Strode 2014-03-06 15:31:20 -05:00
parent 9a58de52dd
commit e89adaac8a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libply-splash-core/ply-device-manager.c
View file

@ -420,6 +420,10 @@ get_terminal (ply_device_manager_t *manager,
strcmp (full_name, "/dev/tty") == 0 ||
strcmp (full_name, ply_terminal_get_name (manager->local_console_terminal)) == 0) {
terminal = manager->local_console_terminal;
ply_hashtable_insert (manager->terminals,
(void *) ply_terminal_get_name (terminal),
terminal);
goto done;
}
@ -466,9 +470,6 @@ ply_device_manager_new (const char *default_tty,
manager->terminals = ply_hashtable_new (ply_hashtable_string_hash, ply_hashtable_string_compare);
manager->renderers = ply_hashtable_new (ply_hashtable_string_hash, ply_hashtable_string_compare);
manager->local_console_terminal = ply_terminal_new (default_tty);
ply_hashtable_insert (manager->terminals,
(void *) ply_terminal_get_name (manager->local_console_terminal),
manager->local_console_terminal);
manager->keyboards = ply_list_new ();
manager->text_displays = ply_list_new ();
manager->pixel_displays = ply_list_new ();