merge develop to main #173

Merged
tcooper merged 11 commits from develop into main 2023-05-03 06:57:56 +00:00
Showing only changes of commit c9ee065c8f - Show all commits

View File

@ -99,8 +99,11 @@ sub run {
# we direct the installer to virtio-console1, and use # we direct the installer to virtio-console1, and use
# virtio-console as a root console # virtio-console as a root console
select_console('virtio-console1'); select_console('virtio-console1');
if (get_var("DISTRI") eq "rocky" && (get_version_major() > 8)) {
unless (wait_serial "Use text mode", timeout => 120) { die "Anaconda has not started."; } unless (wait_serial "Use text mode", timeout => 120) { die "Anaconda has not started."; }
type_string "2\n"; type_string "2\n";
}
# see comment below
unless (wait_serial "Installation") { die "Text version of Anaconda has not started."; } unless (wait_serial "Installation") { die "Text version of Anaconda has not started."; }
} }
else { else {