From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1JL27N-0007Kg-4b
	for mharc-grub-devel@gnu.org; Fri, 01 Feb 2008 15:04:09 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JL27L-0007Jm-N0
	for grub-devel@gnu.org; Fri, 01 Feb 2008 15:04:07 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JL27H-0007Dn-Tk
	for grub-devel@gnu.org; Fri, 01 Feb 2008 15:04:07 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JL27H-0007Db-P5
	for grub-devel@gnu.org; Fri, 01 Feb 2008 15:04:03 -0500
Received: from aybabtu.com ([69.60.117.155])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rmh@aybabtu.com>) id 1JL27H-0007Ex-AW
	for grub-devel@gnu.org; Fri, 01 Feb 2008 15:04:03 -0500
Received: from [192.168.10.6] (helo=thorin)
	by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <rmh@aybabtu.com>) id 1JL27G-0000hD-5b
	for grub-devel@gnu.org; Fri, 01 Feb 2008 21:04:02 +0100
Received: from rmh by thorin with local (Exim 4.63)
	(envelope-from <rmh@aybabtu.com>) id 1JL25m-0007nu-Hc
	for grub-devel@gnu.org; Fri, 01 Feb 2008 21:02:30 +0100
Date: Fri, 1 Feb 2008 21:02:30 +0100
From: Robert Millan <rmh@aybabtu.com>
To: grub-devel@gnu.org
Message-ID: <20080201200230.GA29932@thorin>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="BOKacYhQ+x31HxR3"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Organization: free as in freedom
X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird!
	www.mozilla.com/thunderbird
X-Debbugs-No-Ack: true
User-Agent: Mutt/1.5.13 (2006-08-11)
X-detected-kernel: by monty-python.gnu.org: Genre and OS details not
	recognized.
Subject: [PATCH] don't display menu when there's nothing in it
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: Fri, 01 Feb 2008 20:04:07 -0000


--BOKacYhQ+x31HxR3
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit


normal.mod seems to insist in displaying a menu even if grub.cfg didn't
define any menu entries.  This seems to be due to a bogus check (for
menu instead of menu->size).

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)

--BOKacYhQ+x31HxR3
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="non-menu.diff"


	* normal/main.c (grub_normal_execute): Check for `menu->size' rather
	than `menu' when determining whether menu has to be displayed.

diff -x CVS -x '*~' -x '*.mk' -urp ../grub2/normal/main.c ./normal/main.c
--- ../grub2/normal/main.c	2008-01-15 16:32:17.000000000 +0100
+++ ./normal/main.c	2008-02-01 20:58:56.000000000 +0100
@@ -474,7 +474,7 @@ grub_normal_execute (const char *config,
       grub_errno = GRUB_ERR_NONE;
     }
 
-  if (menu)
+  if (menu->size)
     {
       grub_menu_run (menu, nested);
       if (nested)

--BOKacYhQ+x31HxR3--