From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JNVy0-0004Tg-JO for mharc-grub-devel@gnu.org; Fri, 08 Feb 2008 11:20:44 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JNVxz-0004TG-63 for grub-devel@gnu.org; Fri, 08 Feb 2008 11:20:43 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JNVxx-0004Sg-LR for grub-devel@gnu.org; Fri, 08 Feb 2008 11:20:42 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JNVxx-0004SZ-BF for grub-devel@gnu.org; Fri, 08 Feb 2008 11:20:41 -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 ) id 1JNVxx-0003tY-0F for grub-devel@gnu.org; Fri, 08 Feb 2008 11:20:41 -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 ) id 1JNVxu-000747-Nk for grub-devel@gnu.org; Fri, 08 Feb 2008 17:20:40 +0100 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1JNVwF-00054j-MH for grub-devel@gnu.org; Fri, 08 Feb 2008 17:18:55 +0100 Date: Fri, 8 Feb 2008 17:18:55 +0100 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20080208161855.GA19377@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="envbJBWh7q8WU6mo" 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] if timeout is set to zero, don't bother drawing the menu X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Feb 2008 16:20:43 -0000 --envbJBWh7q8WU6mo Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Fixes an ugly result of setting timeout=0. When this is combined with the "sleep" patch I just sent, user can implement hiddenmenu-like functionality via scripting: echo -n "Press `ESC' to enter the menu... " if sleep -v -i 10 ; then set timeout=10 else set timeout=0 fi -- Robert Millan I know my rights; I want my phone call! What use is a phone call… if you are unable to speak? (as seen on /.) --envbJBWh7q8WU6mo Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="zero_timeout.diff" * normal/menu.c (run_menu): If timeout is set to zero, don't bother drawing the menu. diff -x configure -x config.h.in -x CVS -x '*~' -x '*.mk' -urp ../grub2/normal/menu.c ./normal/menu.c --- ../grub2/normal/menu.c 2008-01-15 15:05:40.000000000 +0100 +++ ./normal/menu.c 2008-02-08 17:11:41.000000000 +0100 @@ -339,6 +339,10 @@ run_menu (grub_menu_t menu, int nested) if (default_entry < 0 || default_entry >= menu->size) default_entry = 0; + /* If timeout is 0, drawing is pointless (and ugly). */ + if (get_timeout () == 0) + return default_entry; + offset = default_entry; if (offset > GRUB_TERM_NUM_ENTRIES - 1) { --envbJBWh7q8WU6mo--