Skip to content

Commit 33dc961

Browse files
committed
Merge tag 'ktest-v5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest
Pull ktest fix from Steven Rostedt: "Fix issues with grub2bls in ktest.pl ktest.pl did not know about grub2bls that was introduced in Fedora 30, and now it does" * tag 'ktest-v5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest: ktest.pl: Fix incorrect reboot for grub2bls
2 parents 47003b9 + 271e0c9 commit 33dc961

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)