Call set_grub_uefi_root to override the grub path in tests

ComplianceAsCode · Feb 10, 2025 · f641b78 · f641b78
1 parent 8636f01
commit f641b78
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/...x_os/guide/system/bootloader-grub2/non-uefi/grub2_password/tests/invalid_username.fail.sh b/...x_os/guide/system/bootloader-grub2/non-uefi/grub2_password/tests/invalid_username.fail.sh
@@ -4,6 +4,8 @@
 
 . $SHARED/grub2.sh
 
+set_grub_uefi_root
+
 make_grub_password
 
 set_superusers "use r"
diff --git a/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/tests/missing.fail.sh b/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/tests/missing.fail.sh
@@ -4,5 +4,7 @@
 
 . $SHARED/grub2.sh
 
+set_grub_uefi_root
+
 touch "$GRUB_CFG_ROOT/grub.cfg"
 rm -f "$GRUB_CFG_ROOT/user.cfg"
diff --git a/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/tests/password-set.pass.sh b/linux_os/guide/system/bootloader-grub2/non-uefi/grub2_password/tests/password-set.pass.sh
@@ -2,4 +2,6 @@
 
 . $SHARED/grub2.sh
 
+set_grub_uefi_root
+
 make_grub_password
diff --git a/..._os/guide/system/bootloader-grub2/non-uefi/grub2_password/tests/unquoted_username.pass.sh b/..._os/guide/system/bootloader-grub2/non-uefi/grub2_password/tests/unquoted_username.pass.sh
@@ -2,6 +2,8 @@
 
 . $SHARED/grub2.sh
 
+set_grub_uefi_root
+
 make_grub_password
 
 set_superusers_unquoted "koksic"
diff --git a/tests/shared/grub2.sh b/tests/shared/grub2.sh
@@ -11,6 +11,8 @@ function set_grub_uefi_root {
 		fi
 	elif grep NAME /etc/os-release | grep -iq "Oracle"; then
 		GRUB_CFG_ROOT=/boot/efi/EFI/redhat
+	elif grep NAME /etc/os-release | grep -iq "Ubuntu"; then
+		GRUB_CFG_ROOT=/boot/grub
 	fi
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,6 @@

		. $SHARED/grub2.sh

		set_grub_uefi_root

		make_grub_password