Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp3075329rwb; Wed, 30 Nov 2022 15:09:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf4rq784ML000W6NXQeYcuVRSVkTEK1k3B8mMbHuuGgIpyOvPPhyYAMJEuEIayEe+5/ftnk9 X-Received: by 2002:a17:903:110c:b0:189:8351:8bd9 with SMTP id n12-20020a170903110c00b0018983518bd9mr19927492plh.94.1669849742500; Wed, 30 Nov 2022 15:09:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669849742; cv=none; d=google.com; s=arc-20160816; b=sMj45A3zmQky+LSF3zzgGvMJHrLQR8kXKB7WO1MFcUEMhYO54kfJgwsgTDOBEqfKwy C6Fnr908d70OtqCl4yg3AxF8WR5qYAPg34wcuwR5RirlCHKrpQ3W9P9UfeADn3dbXdAT IjxhQ1tOAOpNHDnBujDlTtcezQ9it/JZ3mizbMVm2YrsZvuP3qsTkM+/hInLnuyHxFVq yolkTjApyS3h0av/HUnvqD1pkBzESR2uqlqXL0AUiud88QcY+6iQfcIYxpFPtvFx/Dcc yo0B6J/P4Ya4oZpz3PO42drd3DCSZFOlvKzvdlrokXZWzKBUX7ANJaJXmrD7OTP36cBA QtHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:subject:cc:to:from:date; bh=+C3fbfbp0faAwla/LVubOeTQiM+aa/uVumxrw2jeBaI=; b=uGpctJIJ1cuO/QUd2uJQUXWtXyfSZF5SHTkMpQBuNLlPxBGCZB/4zNHJZNztfxuACm wdAaiSHm1wdk/mvNP/kknP4ueZYjv/mgY8WxCJn5yus4HplKSnet/P4EfY4jN8CNPmbC L7550iVQIkElBcqdQZpSQ1gNEy1eR5/ejfkUvBDeYHYi33iBr4Tdc30SzZw3U3OV4CbO GCcIE/rGIOkWebp3F9NKn+fV48y6bJkZqmgGePWCTQrXGRZxi5wGen/KtUsq85A7SivI xBINSZbRtEJXQdWC4wipqN+ZNRmVqmMVnSTcbN3DNRQzu3ULO+UFEGT7eAch0PIJMoMM Y12Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h62-20020a638341000000b00477c7ba9baasi2547660pge.418.2022.11.30.15.08.49; Wed, 30 Nov 2022 15:09:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229726AbiK3Wym (ORCPT + 83 others); Wed, 30 Nov 2022 17:54:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229607AbiK3Wyk (ORCPT ); Wed, 30 Nov 2022 17:54:40 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E817E91340 for ; Wed, 30 Nov 2022 14:54:38 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9DB52B81D12 for ; Wed, 30 Nov 2022 22:54:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E24C1C433C1; Wed, 30 Nov 2022 22:54:35 +0000 (UTC) Date: Wed, 30 Nov 2022 17:54:34 -0500 From: Steven Rostedt To: LKML Cc: John 'Warthog9' Hawley Subject: [PATCH] kest.pl: Fix grub2 menu handling for rebooting Message-ID: <20221130175434.555ea650@gandalf.local.home> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steven Rostedt grub2 has submenus where to use grub-reboot, it requires: grub-reboot X>Y where X is the main index and Y is the submenu. Thus if you have: menuentry 'Debian GNU/Linux' --class debian --class gnu-linux ... [...] } submenu 'Advanced options for Debian GNU/Linux' $menuentry_id_option ... menuentry 'Debian GNU/Linux, with Linux 6.0.0-4-amd64' --class debian --class gnu-linux ... [...] } menuentry 'Debian GNU/Linux, with Linux 6.0.0-4-amd64 (recovery mode)' --class debian --class gnu-linux ... [...] } menuentry 'Debian GNU/Linux, with Linux test' --class debian --class gnu-linux ... [...] } And wanted to boot to the "Linux test" kernel, you need to run: # grub-reboot 1>2 As 1 is the second top menu (the submenu) and 2 is the third of the sub menu entries. Have the grub.cfg parsing for grub2 handle such cases. Signed-off-by: Steven Rostedt --- tools/testing/ktest/ktest.pl | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 799cfc4aa12b..590518144167 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -1963,7 +1963,7 @@ sub run_scp_mod { sub _get_grub_index { - my ($command, $target, $skip) = @_; + my ($command, $target, $skip, $submenu) = @_; return if (defined($grub_number) && defined($last_grub_menu) && $last_grub_menu eq $grub_menu && defined($last_machine) && @@ -1980,11 +1980,16 @@ sub _get_grub_index { my $found = 0; + my $submenu_number = 0; + while () { if (/$target/) { $grub_number++; $found = 1; last; + } elsif (defined($submenu) && /$submenu/) { + $submenu_number++; + $grub_number = -1; } elsif (/$skip/) { $grub_number++; } @@ -1993,6 +1998,9 @@ sub _get_grub_index { dodie "Could not find '$grub_menu' through $command on $machine" if (!$found); + if ($submenu_number > 0) { + $grub_number = "$submenu_number>$grub_number"; + } doprint "$grub_number\n"; $last_grub_menu = $grub_menu; $last_machine = $machine; @@ -2003,6 +2011,7 @@ sub get_grub_index { my $command; my $target; my $skip; + my $submenu; my $grub_menu_qt; if ($reboot_type !~ /^grub/) { @@ -2017,8 +2026,9 @@ sub get_grub_index { $skip = '^\s*title\s'; } elsif ($reboot_type eq "grub2") { $command = "cat $grub_file"; - $target = '^menuentry.*' . $grub_menu_qt; - $skip = '^menuentry\s|^submenu\s'; + $target = '^\s*menuentry.*' . $grub_menu_qt; + $skip = '^\s*menuentry'; + $submenu = '^\s*submenu\s'; } elsif ($reboot_type eq "grub2bls") { $command = $grub_bls_get; $target = '^title=.*' . $grub_menu_qt; @@ -2027,7 +2037,7 @@ sub get_grub_index { return; } - _get_grub_index($command, $target, $skip); + _get_grub_index($command, $target, $skip, $submenu); } sub wait_for_input { @@ -2090,7 +2100,7 @@ sub reboot_to { if ($reboot_type eq "grub") { run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch)'"; } elsif (($reboot_type eq "grub2") or ($reboot_type eq "grub2bls")) { - run_ssh "$grub_reboot $grub_number"; + run_ssh "$grub_reboot \"'$grub_number'\""; } elsif ($reboot_type eq "syslinux") { run_ssh "$syslinux --once \\\"$syslinux_label\\\" $syslinux_path"; } elsif (defined $reboot_script) { -- 2.35.1