* [for-next][PATCH] ktest: Take submenu into account for grub2 menus
@ 2018-04-11 13:12 Steven Rostedt
0 siblings, 0 replies; only message in thread
From: Steven Rostedt @ 2018-04-11 13:12 UTC (permalink / raw)
To: LKML; +Cc: John 'Warthog9' Hawley, Satoru Takeuchi
Another old patch from my INBOX.
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git
for-next
Head SHA1: 6cd110a91f52197e3392809cd43466bfe2c524d0
Satoru Takeuchi (1):
ktest: Take submenu into account for grub2 menus
----
tools/testing/ktest/ktest.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit 6cd110a91f52197e3392809cd43466bfe2c524d0
Author: Satoru Takeuchi <satoru.takeuchi@gmail.com>
Date: Fri Sep 22 13:38:19 2017 +0900
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: Satoru Takeuchi <satoru.takeuchi@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index a14fc309d140..777388cc8221 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1872,7 +1872,7 @@ sub get_grub2_index {
$grub_number++;
$found = 1;
last;
- } elsif (/^menuentry\s/) {
+ } elsif (/^menuentry\s|^submenu\s/) {
$grub_number++;
}
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-04-11 13:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-11 13:12 [for-next][PATCH] ktest: Take submenu into account for grub2 menus Steven Rostedt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.