Messages in this thread Patch in this message | | | Date | Fri, 28 Oct 2011 07:16:03 -0400 | From | Steven Rostedt <> | Subject | [PATCH 05/21] ktest: Fail when grub menu not found |
| |
From: Steven Rostedt <srostedt@redhat.com>
Currently if the grub menu that is supplied is not found, it will just boot into the last grub menu in menu.lst. Fail instead of confusing the user why their kernel is not booting.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org> --- tools/testing/ktest/ktest.pl | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index debc689..ca6ff99 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -862,9 +862,12 @@ sub get_grub_index { open(IN, "$ssh_grub |") or die "unable to get menu.lst"; + my $found = 0; + while (<IN>) { if (/^\s*title\s+$grub_menu\s*$/) { $grub_number++; + $found = 1; last; } elsif (/^\s*title\s/) { $grub_number++; @@ -873,7 +876,7 @@ sub get_grub_index { close(IN); die "Could not find '$grub_menu' in /boot/grub/menu on $machine" - if ($grub_number < 0); + if (!$found); doprint "$grub_number\n"; } -- 1.7.6.3
[unhandled content-type:application/pgp-signature] | |