Commit 6c2ca9c2 authored by Jonathan Riddell's avatar Jonathan Riddell 🛶

try to make it cover both oem and normal case

parent 0a29bd26
......@@ -188,6 +188,11 @@ sub bootloader {
# When it is grub we need to hit enter to proceed.
assert_screen 'bootloader', 60;
if (match_has_tag('live-bootloader-uefi')) {
if (testapi::get_var("INSTALLATION_OEM")) {
send_key 'down';
assert_screen('live-bootloader-uefi-oem');
}
# Hack to force kmsg onto ttyS1 to debug shutdown problems. This hack
# can be dropped once neon properly shuts down all the time again!
# Edits grub entry to add more kernel cmdlines.
......@@ -203,18 +208,20 @@ sub bootloader {
}
send_key 'end';
send_key 'left';
send_key 'left';
send_key 'left';
if (testapi::get_var("INSTALLATION_OEM")) {
foreach my $i (0..25) {
send_key 'left';
}
} else {
send_key 'left';
send_key 'left';
send_key 'left';
}
# Set the kmsg target to ttyS1. We then also need to force plymouth as
# it'd not do anything if console= is set.
type_string 'console=ttyS1 plymouth.force-splash plymouth.ignore-show-splash plymouth.ignore-serial-consoles ';
send_key 'ctrl-x';
if (testapi::get_var("INSTALLATION_OEM")) {
send_key 'down';
assert_screen('live-bootloader-uefi-oem');
}
send_key 'ret';
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment