[for-next][PATCH] ktest: Take submenu into account for grub2 menus

[Steven Rostedt]

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 
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.takeu...@gmail.com

Signed-off-by: Satoru Takeuchi 
Signed-off-by: Steven Rostedt (VMware) 

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++;
}
 }

[for-next][PATCH] ktest: Take submenu into account for grub2 menus

[Steven Rostedt]

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 
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.takeu...@gmail.com

Signed-off-by: Satoru Takeuchi 
Signed-off-by: Steven Rostedt (VMware) 

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++;
}
 }

Re: [PATCH] ktest: take submenu into account

[Steven Rostedt]

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++;
>   }
>  }

Re: [PATCH] ktest: take submenu into account

[Steven Rostedt]

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++;
>   }
>  }

[PATCH] ktest: take submenu into account

[Satoru Takeuchi]

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 
---
 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++;
}
 }
-- 
2.7.4

[PATCH] ktest: take submenu into account

[Satoru Takeuchi]

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 
---
 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++;
}
 }
-- 
2.7.4