More tweaking for UEFI boot params on aarch64

Seems we're dealing with a bug, here.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-03-20 15:07:02 -07:00
parent cc1067a95a
commit e685f00bd0

View File

@ -229,12 +229,16 @@ sub do_bootloader {
else { else {
send_key "e"; send_key "e";
# 2 'downs' to reach the kernel line for UEFI installer, # 2 'downs' to reach the kernel line for UEFI installer,
# 13 'downs' on installed x86_64, 12 'downs' on installed # 13 'downs' on installed x86_64. 12 'downs' on installed
# aarch64 / ppc64 (there's a 'set_root' line on x86_64 but # ppc64, because it doesn't have a 'set gfxpayload=keep'
# not on aarch64 or ppc64) # line. installed aarch64 is tricky: it should be 13, I
# think - it has a set gfxpayload=keep line - but it seems
# that on F27 installs (i.e. support_server) there is a
# 'set root' line, but on F28+ installs there is not, so
# the count is 12. So we have to do something gross.
my $presses = 2; my $presses = 2;
if ($args{postinstall}) { if ($args{postinstall}) {
if (get_var('OFW') || get_var('ARCH') eq 'aarch64') { if (get_var('OFW') || (get_var('ARCH') eq 'aarch64' && get_var('TEST') ne 'support_server')) {
$presses = 12; $presses = 12;
} else { } else {
$presses = 13; $presses = 13;