Commit 33dc9614 authored Dec 10, 2020 by Linus Torvalds

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

parents 47003b99 271e0c9d

tools/testing/ktest/ktest.pl

+1 −1

Original line number	Diff line number	Diff line
		@@ -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";

Admin message