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

Commit 6cd110a9 authored by Satoru Takeuchi's avatar Satoru Takeuchi Committed by Steven Rostedt (VMware)
Browse files

ktest: Take submenu into account for grub2 menus 

grub-reboot selects the submenu's first menuentry (title is "1>0") rather than ktest's
menuentry (title is "2") by mistake.

===
$ sudo cat /boot/grub/grub.cfg  | grep -E "^menuentry|^submenu"
...
menuentry 'Ubuntu' --class ubuntu --class gnu-linux --class gnu --class os $menuentry_id_option '...' {
...
submenu 'Advanced options for Ubuntu' $menuentry_id_option '...' {
...
menuentry 'ktest' {
...
===

Correct it by taking submenu entries into account in get_grub2_index().

Link: http://lkml.kernel.org/r/87poaje4as.wl-satoru.takeuchi@gmail.com



Signed-off-by: default avatarSatoru Takeuchi <satoru.takeuchi@gmail.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent c2d84ddb

tools/testing/ktest/ktest.pl

+1 −1
Original line number Diff line number Diff line
@@ -1872,7 +1872,7 @@ sub get_grub2_index { 
	    $grub_number++;

	    $found = 1;

	    last;

	} elsif (/^menuentry\s/) {

	} elsif (/^menuentry\s|^submenu\s/) {

	    $grub_number++;

	}

    }