From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752628AbdJDPjb (ORCPT ); Wed, 4 Oct 2017 11:39:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:35256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752409AbdJDPj3 (ORCPT ); Wed, 4 Oct 2017 11:39:29 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95B61218F1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=rostedt@goodmis.org Date: Wed, 4 Oct 2017 11:39:26 -0400 From: Steven Rostedt To: Satoru Takeuchi Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH] ktest: take submenu into account Message-ID: <20171004113926.0d0a560f@gandalf.local.home> In-Reply-To: <87poaje4as.wl-satoru.takeuchi@gmail.com> References: <87poaje4as.wl-satoru.takeuchi@gmail.com> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 22 Sep 2017 13:38:19 +0900 Satoru Takeuchi wrote: > 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(). > > Signed-off-by: Satoru Takeuchi Thanks for sending this. I was traveling (Embedded and Kernel Recipes) and just saw this email now. I'll add it to my priority todo list. I'll look at it and if all goes well, it should make the next merge window. -- Steve > --- > 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 0c8b61f..6cf135a 100755 > --- a/tools/testing/ktest/ktest.pl > +++ b/tools/testing/ktest/ktest.pl > @@ -1821,7 +1821,7 @@ sub get_grub2_index { > $grub_number++; > $found = 1; > last; > - } elsif (/^menuentry\s/) { > + } elsif (/^menuentry\s|^submenu\s/) { > $grub_number++; > } > }