From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C10AC63697 for ; Sat, 21 Nov 2020 04:12:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DDD2C223B0 for ; Sat, 21 Nov 2020 04:12:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727184AbgKUEMU (ORCPT ); Fri, 20 Nov 2020 23:12:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:58374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726329AbgKUEMU (ORCPT ); Fri, 20 Nov 2020 23:12:20 -0500 Received: from oasis.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 347CD22227; Sat, 21 Nov 2020 04:12:19 +0000 (UTC) Date: Fri, 20 Nov 2020 23:12:17 -0500 From: Steven Rostedt To: Libo Chen Cc: linux-kernel@vger.kernel.org, m.mizuma@jp.fujitsu.com Subject: Re: [PATCH 1/1] ktest.pl: Fix incorrect reboot for grub2bls Message-ID: <20201120231217.7fdc38d6@oasis.local.home> In-Reply-To: <20201121021243.1532477-1-libo.chen@oracle.com> References: <20201121021243.1532477-1-libo.chen@oracle.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 20 Nov 2020 18:12:43 -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") I was just thinking a couple of hours ago if anyone uses ktest.pl, and if so, how come I haven't received any patches for it ;-) Anyway, I'll take a look at this next week, and it may be a while before it gets into the kernel, as I like to run updates for a few weeks on my systems (as I use it to build all my kernels), before I push it upstream. Thanks! -- Steve > > Signed-off-by: Libo Chen > --- > 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";