aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Axtens <dja@axtens.net>2022-04-21 15:24:13 +1000
committerDaniel Kiper <daniel.kiper@oracle.com>2022-06-28 17:21:07 +0200
commit188d2ff1c3a5d72220bb599e0d95e0f752bae7e9 (patch)
treee690a53e12ef3985b877c7614ec7c3553e99e381
parent2f4430cc0a44fd8c8aa7aee5c51887667ad3d6c3 (diff)
downloadgrub-188d2ff1c3a5d72220bb599e0d95e0f752bae7e9.tar.gz
tests: Only pass SeaBIOS fw_opt for x86 non-EFI platforms
This breaks the tests on pseries - just restrict it to x86 platforms that don't specify an EFI. Signed-off-by: Daniel Axtens <dja@axtens.net> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-rw-r--r--tests/util/grub-shell.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 33590baeb..4828afb7c 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -376,7 +376,11 @@ if test -z "$debug"; then
# workaround unfortunately causes qemu to issue a warning 'externally
# provided fw_cfg item names should be prefixed with "opt/"', but there
# doesn't seem to be a better option.
- qemuopts="${qemuopts} -fw_cfg name=etc/sercon-port,string=0"
+ #
+ # SeaBIOS is used for i386, except on EFI.
+ if [ ${grub_modinfo_target_cpu} == 'i386' ] && [ ${grub_modinfo_platform} != 'efi' ]; then
+ qemuopts="${qemuopts} -fw_cfg name=etc/sercon-port,string=0"
+ fi
fi
if [ x$boot != xnet ] && [ x$boot != xemu ]; then