diff options
| author | Linus Torvalds | 2020-12-10 16:51:27 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2020-12-10 16:51:27 -0800 |
| commit | 33dc9614dc208291d0c4bcdeb5d30d481dcd2c4c (patch) | |
| tree | 2a80557a09e21a78f542440c60f53f6781d238e5 | |
| parent | 47003b9971cc7c38737f21e07034502ca35ab7af (diff) | |
| parent | 271e0c9dce1b02a825b3cc1a7aa1fab7c381d44b (diff) | |
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
| -rwxr-xr-x | tools/testing/ktest/ktest.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index cb16d2aac51c..54188ee16c48 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -2040,7 +2040,7 @@ sub reboot_to { if ($reboot_type eq "grub") { run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch)'"; - } elsif ($reboot_type eq "grub2") { + } elsif (($reboot_type eq "grub2") or ($reboot_type eq "grub2bls")) { run_ssh "$grub_reboot $grub_number"; } elsif ($reboot_type eq "syslinux") { run_ssh "$syslinux --once \\\"$syslinux_label\\\" $syslinux_path"; |