]> www.infradead.org Git - users/willy/xarray.git/commit
ktest.pl: Avoid false positives with grub2 skip regex
authorDaniel Jordan <daniel.m.jordan@oracle.com>
Wed, 4 Sep 2024 17:55:30 +0000 (13:55 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Wed, 4 Sep 2024 19:06:28 +0000 (15:06 -0400)
commit2351e8c65404aabc433300b6bf90c7a37e8bbc4d
tree195819c4e54f8ace1aa46a5c6162cae23c78f2e8
parentd441734d0cfcebc5780bc1880d871f92debb588a
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.

Link: https://lore.kernel.org/20240904175530.84175-1-daniel.m.jordan@oracle.com
Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Acked-by: John 'Warthog9' Hawley (Tenstorrent) <warthog9@eaglescrag.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
tools/testing/ktest/ktest.pl