From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MbWsp-0000BN-Sf for mharc-grub-devel@gnu.org; Thu, 13 Aug 2009 05:46:07 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MbWsm-00008v-VO for grub-devel@gnu.org; Thu, 13 Aug 2009 05:46:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MbWsb-0008Up-IV for grub-devel@gnu.org; Thu, 13 Aug 2009 05:46:02 -0400 Received: from [199.232.76.173] (port=37171 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbWsa-0008Uc-Hh for grub-devel@gnu.org; Thu, 13 Aug 2009 05:45:52 -0400 Received: from smarthost01.mail.zen.net.uk ([212.23.3.140]:60977) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MbWsZ-00085N-GJ for grub-devel@gnu.org; Thu, 13 Aug 2009 05:45:51 -0400 Received: from [82.69.40.219] (helo=riva.pelham.vpn.ucam.org) by smarthost01.mail.zen.net.uk with esmtp (Exim 4.63) (envelope-from ) id 1MbWsX-0004f2-Ey for grub-devel@gnu.org; Thu, 13 Aug 2009 09:45:50 +0000 Received: from cjwatson by riva.pelham.vpn.ucam.org with local (Exim 3.36 #1 (Debian)) for grub-devel@gnu.org id 1MbWsW-00032z-00; Thu, 13 Aug 2009 10:45:48 +0100 Date: Thu, 13 Aug 2009 10:45:48 +0100 From: Colin Watson To: The development of GRUB 2 Message-ID: <20090813094548.GH11691@riva.ucam.org> References: <20090810103811.GO11691@riva.ucam.org> <20090810114450.GH9344@thorin> <20090810115505.GT11691@riva.ucam.org> <20090810151031.GA11134@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Sr/1Pkwuhjf1+ztR" Content-Disposition: inline In-Reply-To: <20090810151031.GA11134@thorin> User-Agent: Mutt/1.5.18 (2008-05-17) X-Originating-Smarthost01-IP: [82.69.40.219] X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: Re: [PATCH] Integrate hiddenmenu 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: Thu, 13 Aug 2009 09:46:05 -0000 --Sr/1Pkwuhjf1+ztR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Aug 10, 2009 at 05:10:31PM +0200, Robert Millan wrote: > On Mon, Aug 10, 2009 at 12:55:05PM +0100, Colin Watson wrote: > > > If we default to verbose, we could also have an option to turn it off from > > > /etc/default/grub, if that makes life easier for you. > > > > Slightly, I suppose. I thought there were some feelings against > > excessive numbers of options which is why I didn't suggest that. > > GRUB_HIDDEN_TIMEOUT_QUIET=1? > > For this one I don't mind. But would you please make it "(true|false)" ? OK. How's this? Thanks, -- Colin Watson [cjwatson@ubuntu.com] --Sr/1Pkwuhjf1+ztR Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="grub2-hidden-timeout.diff" diff -Nur -x '*.orig' -x '*~' grub2-1.96+20090725/util/grub-mkconfig.in grub2-1.96+20090725.new/util/grub-mkconfig.in --- grub2-1.96+20090725/util/grub-mkconfig.in 2009-08-08 19:31:00.000000000 +0100 +++ grub2-1.96+20090725.new/util/grub-mkconfig.in 2009-08-13 09:39:20.000000000 +0100 @@ -173,7 +173,7 @@ export GRUB_DEVICE GRUB_DEVICE_UUID GRUB_DEVICE_BOOT GRUB_DEVICE_BOOT_UUID GRUB_FS GRUB_FONT_PATH GRUB_PRELOAD_MODULES # These are optional, user-defined variables. -export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX GRUB_CMDLINE_LINUX_DEFAULT GRUB_TERMINAL_INPUT GRUB_TERMINAL_OUTPUT GRUB_SERIAL_COMMAND GRUB_DISABLE_LINUX_UUID GRUB_DISABLE_LINUX_RECOVERY GRUB_GFXMODE +export GRUB_DEFAULT GRUB_HIDDEN_TIMEOUT GRUB_HIDDEN_TIMEOUT_QUIET GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX GRUB_CMDLINE_LINUX_DEFAULT GRUB_TERMINAL_INPUT GRUB_TERMINAL_OUTPUT GRUB_SERIAL_COMMAND GRUB_DISABLE_LINUX_UUID GRUB_DISABLE_LINUX_RECOVERY GRUB_GFXMODE if test "x${grub_cfg}" != "x"; then rm -f ${grub_cfg}.new diff -Nur -x '*.orig' -x '*~' grub2-1.96+20090725/util/grub.d/00_header.in grub2-1.96+20090725.new/util/grub.d/00_header.in --- grub2-1.96+20090725/util/grub.d/00_header.in 2009-08-13 09:32:50.000000000 +0100 +++ grub2-1.96+20090725.new/util/grub.d/00_header.in 2009-08-13 09:39:20.000000000 +0100 @@ -37,7 +37,6 @@ cat << EOF set default=${GRUB_DEFAULT} -set timeout=${GRUB_TIMEOUT} EOF case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in @@ -112,3 +111,20 @@ EOF ;; esac + +if [ "x${GRUB_HIDDEN_TIMEOUT}" != "x" ] ; then + if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then + verbose= + else + verbose=" --verbose" + fi + cat << EOF +if sleep$verbose --interruptible ${GRUB_HIDDEN_TIMEOUT} ; then + set timeout=${GRUB_TIMEOUT} +fi +EOF +else + cat << EOF +set timeout=${GRUB_TIMEOUT} +EOF +fi --Sr/1Pkwuhjf1+ztR--