From dcb51c3647e385e4899de604f784ed1bc233b869 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 1 Jun 2022 16:20:10 -0700
Subject: [PATCH] tests: Update tests for grub2 bios boot

(cherry picked from commit ee85df30b44c98837e9f0ae2b5d4ee1e1c86f4a9)
---
 tests/scripts/run_tests.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh
index 0cd66f5..5b62988 100755
--- a/tests/scripts/run_tests.sh
+++ b/tests/scripts/run_tests.sh
@@ -55,8 +55,8 @@ function test_ks {
     # Is there a kickstart in / of the iso?
     [ -e "$ISODIR/$KSNAME" ] || fail "Missing kickstart"
 
-    # Is the kickstart in the BIOS config?
-    grep "inst.ks=.*$KSNAME" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg kickstart entry"
+    # Is the kickstart in the GRUB2 BIOS config?
+    grep "inst.ks=.*$KSNAME" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg kickstart entry"
 
     # Is the kickstart in the UEFI config?
     grep "inst.ks=.*$KSNAME" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry"
@@ -79,7 +79,7 @@ function ks_serial {
 function test_ks_serial {
 
     # Is the serial in the BIOS config?
-    grep "console=ttyS0,115200n8" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg cmdline entry"
+    grep "console=ttyS0,115200n8" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg cmdline entry"
 
     # Is the serial in the UEFI config?
     grep "console=ttyS0,115200n8" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg cmdline entry"
@@ -101,7 +101,7 @@ function new_volid {
 
 function test_volid {
     # Is the VOLID in the BIOS config?
-    grep "hd:LABEL=mkksiso-test" "$ISODIR/isolinux/isolinux.cfg" || fail "Missing isolinux.cfg kickstart entry"
+    grep "hd:LABEL=mkksiso-test" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg kickstart entry"
 
     # Is the VOLID in the UEFI config?
     grep "hd:LABEL=mkksiso-test" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg kickstart entry"