Skip to content

Commit 271e0c9

Browse files
Libo Chenrostedt
authored andcommitted
ktest.pl: Fix incorrect reboot for grub2bls
This issue was first noticed when I was testing different kernels on Oracle Linux 8 which as Fedora 30+ adopts BLS as default. Even though a kernel entry was added successfully and the index of that kernel entry was retrieved correctly, ktest still wouldn't reboot the system into user-specified kernel. The bug was spotted in subroutine reboot_to where the if-statement never checks for REBOOT_TYPE "grub2bls", therefore the desired entry will not be set for the next boot. Add a check for "grub2bls" so that $grub_reboot $grub_number can be run before a reboot if REBOOT_TYPE is "grub2bls" then we can boot to the correct kernel. Link: https://lkml.kernel.org/r/20201121021243.1532477-1-libo.chen@oracle.com Cc: stable@vger.kernel.org Fixes: ac24664 ("ktest: introduce grub2bls REBOOT_TYPE option") Signed-off-by: Libo Chen <libo.chen@oracle.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
1 parent b650545 commit 271e0c9

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

tools/testing/ktest/ktest.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2040,7 +2040,7 @@ sub reboot_to {
20402040

20412041
if ($reboot_type eq "grub") {
20422042
run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch)'";
2043-
} elsif ($reboot_type eq "grub2") {
2043+
} elsif (($reboot_type eq "grub2") or ($reboot_type eq "grub2bls")) {
20442044
run_ssh "$grub_reboot $grub_number";
20452045
} elsif ($reboot_type eq "syslinux") {
20462046
run_ssh "$syslinux --once \\\"$syslinux_label\\\" $syslinux_path";

0 commit comments

Comments
 (0)