srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-12-22 10:23:09 +00:00
Code Issues Releases Activity

Simplify anacondatest root_console to always use tty3

Browse Source 
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 <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-10-26 09:21:53 -07:00
parent d20f64967c
commit cfb226d3fd
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/anacondatest.pm
View File

@ -119,11 +119,7 @@ sub root_console {
# passed to console_login # passed to console_login
timeout => 0, timeout => 0,
@_); @_);
# Handle https://bugzilla.redhat.com/show_bug.cgi?id=1635033 if (get_var("SERIAL_CONSOLE")) {
if (get_var("LIVE") && get_var("DESKTOP") eq "gnome") {
send_key "ctrl-alt-f3";
}
elsif (get_var("SERIAL_CONSOLE")) {
# select first virtio terminal, we rely on anaconda having run # select first virtio terminal, we rely on anaconda having run
# a root shell on it for us # a root shell on it for us
select_console("virtio-console"); select_console("virtio-console");
@ -132,7 +128,8 @@ sub root_console {
return; return;
} }
else { 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}); console_login(user=>"root", timeout=>$args{timeout});
} }