From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JJis9-0000Iy-TO
	for mharc-grub-devel@gnu.org; Tue, 29 Jan 2008 00:19:01 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JJis7-0000IB-Sg
	for grub-devel@gnu.org; Tue, 29 Jan 2008 00:18:59 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JJis5-0000Hi-R7
	for grub-devel@gnu.org; Tue, 29 Jan 2008 00:18:58 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JJis5-0000Hf-HX
	for grub-devel@gnu.org; Tue, 29 Jan 2008 00:18:57 -0500
Received: from smtp6-g19.free.fr ([212.27.42.36])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <tgingold@free.fr>) id 1JJis5-00046t-V9
	for grub-devel@gnu.org; Tue, 29 Jan 2008 00:18:58 -0500
Received: from smtp6-g19.free.fr (localhost.localdomain [127.0.0.1])
	by smtp6-g19.free.fr (Postfix) with ESMTP id A323C5FD65
	for <grub-devel@gnu.org>; Tue, 29 Jan 2008 06:18:53 +0100 (CET)
Received: from saphi (boi78-1-82-232-198-173.fbx.proxad.net [82.232.198.173])
	by smtp6-g19.free.fr (Postfix) with ESMTP id 8AB5B5FD61
	for <grub-devel@gnu.org>; Tue, 29 Jan 2008 06:18:53 +0100 (CET)
Received: from gingold by saphi with local (Exim 3.36 #1 (Debian))
	id 1JJiz3-0000gb-00
	for <grub-devel@gnu.org>; Tue, 29 Jan 2008 06:26:09 +0100
Date: Tue, 29 Jan 2008 06:26:09 +0100
To: grub-devel@gnu.org
Message-ID: <20080129052609.GA2637@saphi>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="J/dobhs11T7y2rNN"
Content-Disposition: inline
User-Agent: Mutt/1.5.9i
From: Tristan Gingold <tgingold@free.fr>
X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3)
Subject: PATCH: silently accept empty lines in rescue mode
X-BeenThere: grub-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: The development of GRUB 2 <grub-devel@gnu.org>
List-Id: The development of GRUB 2 <grub-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grub-devel>,
	<mailto:grub-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grub-devel>
List-Post: <mailto:grub-devel@gnu.org>
List-Help: <mailto:grub-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grub-devel>,
	<mailto:grub-devel-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jan 2008 05:19:00 -0000


--J/dobhs11T7y2rNN
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

extracted from my IA64 patch.

Tristan.

--J/dobhs11T7y2rNN
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="grub-rescue.diff"

2008-01-28  Tristan Gingold  <gingold@free.fr>

	* kern/rescue.c: Silently accept empty lines.


diff -ruNp -x '*~' -x CVS grub2.orig/kern/rescue.c grub2/kern/rescue.c
--- grub2.orig/kern/rescue.c	2007-09-03 22:28:23.000000000 +0200
+++ grub2/kern/rescue.c	2008-01-28 16:29:58.000000000 +0100
@@ -659,6 +659,8 @@ grub_enter_rescue_mode (void)
 
       /* Get a command line.  */
       grub_rescue_get_command_line ("grub rescue> ");
+      if (line[0] == 0)
+	continue;
 
       if (grub_parser_split_cmdline (line, getline, &n, &args) || n < 0)
 	continue;

--J/dobhs11T7y2rNN--