From cfb226d3fde5e1e4d6cfb87fe487f7e4356438d9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 26 Oct 2020 09:21:53 -0700 Subject: [PATCH] Simplify anacondatest root_console to always use tty3 Rawhide KDE lives now have the desktop on tty2, and the installer environment tty3 now has a shell (in Ye Olde Times it didn't, not sure when that changed but it's the case at least back to F31). So let's make our lives simple and just always use tty3 here. Signed-off-by: Adam Williamson --- lib/anacondatest.pm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/anacondatest.pm b/lib/anacondatest.pm index 2ac190db..27a768f2 100644 --- a/lib/anacondatest.pm +++ b/lib/anacondatest.pm @@ -119,11 +119,7 @@ sub root_console { # passed to console_login timeout => 0, @_); - # Handle https://bugzilla.redhat.com/show_bug.cgi?id=1635033 - if (get_var("LIVE") && get_var("DESKTOP") eq "gnome") { - send_key "ctrl-alt-f3"; - } - elsif (get_var("SERIAL_CONSOLE")) { + if (get_var("SERIAL_CONSOLE")) { # select first virtio terminal, we rely on anaconda having run # a root shell on it for us select_console("virtio-console"); @@ -132,7 +128,8 @@ sub root_console { return; } else { - send_key "ctrl-alt-f2"; + # tty3 has a shell on all f31+ installer and live images + send_key "ctrl-alt-f3"; } console_login(user=>"root", timeout=>$args{timeout}); }