Kaynağa Gözat

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>
Steven Rostedt 14 yıl önce
ebeveyn
işleme
eaa1fe25ea
1 değiştirilmiş dosya ile 4 ekleme ve 1 silme
  1. 4 1
      tools/testing/ktest/ktest.pl

+ 4 - 1
tools/testing/ktest/ktest.pl

@@ -862,9 +862,12 @@ sub get_grub_index {
     open(IN, "$ssh_grub |")
     open(IN, "$ssh_grub |")
 	or die "unable to get menu.lst";
 	or die "unable to get menu.lst";
 
 
+    my $found = 0;
+
     while (<IN>) {
     while (<IN>) {
 	if (/^\s*title\s+$grub_menu\s*$/) {
 	if (/^\s*title\s+$grub_menu\s*$/) {
 	    $grub_number++;
 	    $grub_number++;
+	    $found = 1;
 	    last;
 	    last;
 	} elsif (/^\s*title\s/) {
 	} elsif (/^\s*title\s/) {
 	    $grub_number++;
 	    $grub_number++;
@@ -873,7 +876,7 @@ sub get_grub_index {
     close(IN);
     close(IN);
 
 
     die "Could not find '$grub_menu' in /boot/grub/menu on $machine"
     die "Could not find '$grub_menu' in /boot/grub/menu on $machine"
-	if ($grub_number < 0);
+	if (!$found);
     doprint "$grub_number\n";
     doprint "$grub_number\n";
 }
 }