Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0b8e270 authored by Daniel Jordan's avatar Daniel Jordan Committed by Greg Kroah-Hartman
Browse files

ktest.pl: Avoid false positives with grub2 skip regex 

[ Upstream commit 2351e8c65404aabc433300b6bf90c7a37e8bbc4d ]

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.

Link: https://lore.kernel.org/20240904175530.84175-1-daniel.m.jordan@oracle.com


Signed-off-by: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
Acked-by: default avatarJohn 'Warthog9' Hawley (Tenstorrent) <warthog9@eaglescrag.net>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1c789859

tools/testing/ktest/ktest.pl

+1 −1
Original line number Diff line number Diff line
@@ -1969,7 +1969,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;