From: Ray Strode Date: Thu, 6 Mar 2014 20:31:20 +0000 (-0500) Subject: device-manager: Don't add local console to terminals hash table unless passed on... X-Git-Tag: 0.9.3~40 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e89adaac8a52e824e222b3febe3364e99a8f4291;p=thirdparty%2Fplymouth.git device-manager: Don't add local console to terminals hash table unless passed on cmdline 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. --- diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c index f6da3393..8cb1aa33 100644 --- a/src/libply-splash-core/ply-device-manager.c +++ b/src/libply-splash-core/ply-device-manager.c @@ -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 ();