On Fri, Nov 20, 2020 at 06:12:43PM -0800, Libo Chen wrote:
> 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.
>
> Fixes: ac2466456eaa ("ktest: introduce grub2bls REBOOT_TYPE option")
>
> Signed-off-by: Libo Chen <[email protected]>
Thank you for the fix!
I tested the patch with fedora33. It works well.
Please feel free to add:
Tested-by: Masayoshi Mizuma <[email protected]>
Thanks!
Masa
> ---
> tools/testing/ktest/ktest.pl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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";
> --
> 2.27.0
>
