提交 eaa1fe25 编写于 作者: S Steven Rostedt 提交者: Steven Rostedt

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: NSteven Rostedt <rostedt@goodmis.org>
上级 2728be41
......@@ -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";
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册