From 4baf1ed572033806c8c00321c79abb5dc7d32846 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Wed, 14 Sep 2011 17:20:39 -0400 Subject: [PATCH] --- yaml --- r: 275167 b: refs/heads/master c: eaa1fe25ea79e94c6727a67baaca3da0791da5de h: refs/heads/master i: 275165: 48538d14e679afcd4009efd76fa5de383eea570f 275163: e4e4a7cb26eaf5e34930e4f3fb3e49a075c85835 275159: 7c3e3076cf95f5ed1c199fb24378511110516dd6 275151: b4178b7c5e0396921f2d403972e5ad061f1441a8 275135: bfd38527860bbe5a1eb0394eddc226537516f35d v: v3 --- [refs] | 2 +- trunk/tools/testing/ktest/ktest.pl | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0772003cfbef..35f6970a4414 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2728be418db65aa873ee354168b56f028845e956 +refs/heads/master: eaa1fe25ea79e94c6727a67baaca3da0791da5de diff --git a/trunk/tools/testing/ktest/ktest.pl b/trunk/tools/testing/ktest/ktest.pl index debc6898e60b..ca6ff99ab1a5 100755 --- a/trunk/tools/testing/ktest/ktest.pl +++ b/trunk/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 () { 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"; }