diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2011-09-14 23:20:39 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2011-10-17 17:54:10 +0200 |
| commit | eaa1fe25ea79e94c6727a67baaca3da0791da5de (patch) | |
| tree | 5b209dd8b0ddb6b58fb40b3fa122c3200dcc1054 /tools/testing/ktest | |
| parent | ktest: Include monitor in reboot code (diff) | |
| download | linux-eaa1fe25ea79e94c6727a67baaca3da0791da5de.tar.xz linux-eaa1fe25ea79e94c6727a67baaca3da0791da5de.zip | |
ktest: Fail when grub menu not found
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>
Diffstat (limited to 'tools/testing/ktest')
| -rwxr-xr-x | 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 debc6898e60b..ca6ff99ab1a5 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"; } |