From e685f00bd0bab0a8c6a64bc2a8d83eae92570f35 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 20 Mar 2018 15:07:02 -0700 Subject: [PATCH] More tweaking for UEFI boot params on aarch64 Seems we're dealing with a bug, here. Signed-off-by: Adam Williamson --- lib/utils.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index 9086288f..e40f5ca4 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -229,12 +229,16 @@ sub do_bootloader { else { send_key "e"; # 2 'downs' to reach the kernel line for UEFI installer, - # 13 'downs' on installed x86_64, 12 'downs' on installed - # aarch64 / ppc64 (there's a 'set_root' line on x86_64 but - # not on aarch64 or ppc64) + # 13 'downs' on installed x86_64. 12 'downs' on installed + # ppc64, because it doesn't have a 'set gfxpayload=keep' + # 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; 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; } else { $presses = 13;