[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240904175530.84175-1-daniel.m.jordan@oracle.com>
Date: Wed, 4 Sep 2024 13:55:30 -0400
From: Daniel Jordan <daniel.m.jordan@...cle.com>
To: Steven Rostedt <rostedt@...dmis.org>,
John Hawley <warthog9@...lescrag.net>
Cc: Daniel Jordan <daniel.m.jordan@...cle.com>, linux-kernel@...r.kernel.org
Subject: [PATCH v2] ktest.pl: Avoid false positives with grub2 skip regex
Some distros have grub2 config files with the lines
if [ x"${feature_menuentry_id}" = xy ]; then
menuentry_id_option="--id"
else
menuentry_id_option=""
fi
which match the skip regex defined for grub2 in get_grub_index():
$skip = '^\s*menuentry';
These false positives cause the grub number to be higher than it
should be, and the wrong kernel can end up booting.
Grub documents the menuentry command with whitespace between it and the
title, so make the skip regex reflect this.
Signed-off-by: Daniel Jordan <daniel.m.jordan@...cle.com>
---
v2: Resend, removing unnecessary terminal + from regex.
v1: https://lkml.kernel.org/r/20240802145706.1283189-1-daniel.m.jordan@oracle.com
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 eb31cd9c977bf..621a874b24264 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -2047,7 +2047,7 @@ sub get_grub_index {
} elsif ($reboot_type eq "grub2") {
$command = "cat $grub_file";
$target = '^\s*menuentry.*' . $grub_menu_qt;
- $skip = '^\s*menuentry';
+ $skip = '^\s*menuentry\s';
$submenu = '^\s*submenu\s';
} elsif ($reboot_type eq "grub2bls") {
$command = $grub_bls_get;
--
2.45.2
Powered by blists - more mailing lists