aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2011-09-14 17:20:39 -0400
committerSteven Rostedt <rostedt@goodmis.org>2011-10-17 11:54:10 -0400
commiteaa1fe25ea79e94c6727a67baaca3da0791da5de (patch)
tree5b209dd8b0ddb6b58fb40b3fa122c3200dcc1054
parent2728be418db65aa873ee354168b56f028845e956 (diff)
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>
-rwxr-xr-xtools/testing/ktest/ktest.pl5
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 {
862 open(IN, "$ssh_grub |") 862 open(IN, "$ssh_grub |")
863 or die "unable to get menu.lst"; 863 or die "unable to get menu.lst";
864 864
865 my $found = 0;
866
865 while (<IN>) { 867 while (<IN>) {
866 if (/^\s*title\s+$grub_menu\s*$/) { 868 if (/^\s*title\s+$grub_menu\s*$/) {
867 $grub_number++; 869 $grub_number++;
870 $found = 1;
868 last; 871 last;
869 } elsif (/^\s*title\s/) { 872 } elsif (/^\s*title\s/) {
870 $grub_number++; 873 $grub_number++;
@@ -873,7 +876,7 @@ sub get_grub_index {
873 close(IN); 876 close(IN);
874 877
875 die "Could not find '$grub_menu' in /boot/grub/menu on $machine" 878 die "Could not find '$grub_menu' in /boot/grub/menu on $machine"
876 if ($grub_number < 0); 879 if (!$found);
877 doprint "$grub_number\n"; 880 doprint "$grub_number\n";
878} 881}
879 882