From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Subject: [PATCH 05/17][RFC] ktest: Fail when grub menu not found
Date: Mon, 17 Oct 2011 12:05:00 -0400 [thread overview]
Message-ID: <20111017165949.155637682@goodmis.org> (raw)
In-Reply-To: 20111017160455.498567257@goodmis.org
[-- Attachment #1: Type: text/plain, Size: 1100 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
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>
---
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 debc689..ca6ff99 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";
}
--
1.7.6.3
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2011-10-17 17:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-17 16:04 [PATCH 00/17][RFC] ktest updates for v3.2 Steven Rostedt
2011-10-17 16:04 ` [PATCH 01/17][RFC] ktest: Add TEST_TYPE install option Steven Rostedt
2011-10-17 16:04 ` [PATCH 02/17][RFC] ktest: Create outputdir if it does not exist Steven Rostedt
2011-10-17 16:04 ` [PATCH 03/17][RFC] ktest: Only need to save .config when doing mrproper Steven Rostedt
2011-10-17 16:04 ` [PATCH 04/17][RFC] ktest: Include monitor in reboot code Steven Rostedt
2011-10-17 16:05 ` Steven Rostedt [this message]
2011-10-17 16:05 ` [PATCH 06/17][RFC] ktest: Add NO_INSTALL option to not install for a test Steven Rostedt
2011-10-17 16:05 ` [PATCH 07/17][RFC] ktest: Add option REBOOT_SUCCESS_LINE to stop waiting after a reboot Steven Rostedt
2011-10-17 16:05 ` [PATCH 08/17][RFC] ktest: Do not reboot on config or build issues Steven Rostedt
2011-10-17 16:05 ` [PATCH 09/17][RFC] ktest: Add IF and ELSE to config sections Steven Rostedt
2011-10-17 16:05 ` [PATCH 10/17][RFC] ktest: Let IF keyword take comparisons Steven Rostedt
2011-10-17 16:05 ` [PATCH 11/17][RFC] ktest: Add INCLUDE keyword to include other config files Steven Rostedt
2011-10-17 16:05 ` [PATCH 12/17][RFC] ktest: Consolidate TEST_TYPE and DEFAULT code Steven Rostedt
2011-10-17 16:05 ` [PATCH 13/17][RFC] ktest: Add OVERRIDE keyword to DEFAULTS section Steven Rostedt
2011-10-17 16:05 ` [PATCH 14/17][RFC] ktest: Add DEFINED keyword for IF statements Steven Rostedt
2011-10-17 16:05 ` [PATCH 15/17][RFC] ktest: Sort make_min_config configs by dependecies Steven Rostedt
2011-10-17 16:05 ` [PATCH 16/17][RFC] ktest: Fix parsing of config section lines Steven Rostedt
2011-10-17 16:05 ` [PATCH 17/17][RFC] ktest: Add processing of complex conditionals Steven Rostedt
2011-10-20 14:31 ` [PATCH 00/17][RFC] ktest updates for v3.2 Andrew Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111017165949.155637682@goodmis.org \
--to=rostedt@goodmis.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox