From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VpLcN-0001C5-TR for mharc-grub-devel@gnu.org; Sat, 07 Dec 2013 12:24:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpLcF-0001As-V8 for grub-devel@gnu.org; Sat, 07 Dec 2013 12:24:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VpLc9-0002xY-BA for grub-devel@gnu.org; Sat, 07 Dec 2013 12:24:31 -0500 Received: from mail-la0-x229.google.com ([2a00:1450:4010:c03::229]:39845) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpLc9-0002xM-2w for grub-devel@gnu.org; Sat, 07 Dec 2013 12:24:25 -0500 Received: by mail-la0-f41.google.com with SMTP id eo20so760753lab.14 for ; Sat, 07 Dec 2013 09:24:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=/ftOh/dNbLxcBJ4bmdz3KEJRgTIdMckODGnhyyb4V30=; b=GgLyWAmUWimcjAHdm51y5D4TM6ARe6EE56amPKiOAh/YRG/Wxf0i3VdArCASqubfjP uXQseFUfNMYnfjlkvJDbznCEISbkoK7/L/d5TixIaNnxEtZgSJt3fsTDBoQGK5hQAtm0 RBlrRr11reXZB//BXs+4JuDj9rP2KxUF7mvuGGQa5UgpopiYUrRIobgqltlsG1HEquQ2 RFoGMmSOWbcwePIvsUI0QyjCArk54gnBs64MzvTZu6mmN2KePba2YoBFUGRmFGFgh87i OuR2gZHXOxMwOZS2Yacee9Las8dpxz8qMuV4OAvdrFAHTS+ETQ40c4Fw/kJVdQmccMnx V11A== X-Received: by 10.112.139.35 with SMTP id qv3mr2327400lbb.47.1386437064004; Sat, 07 Dec 2013 09:24:24 -0800 (PST) Received: from localhost.localdomain (ppp91-76-134-134.pppoe.mtu-net.ru. [91.76.134.134]) by mx.google.com with ESMTPSA id xl4sm3775477lac.9.2013.12.07.09.24.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Dec 2013 09:24:23 -0800 (PST) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] fix timeout handling with GRUB_HIDDEN_TIMEOUT=0 Date: Sat, 7 Dec 2013 21:24:19 +0400 Message-Id: <1386437059-25559-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.1.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::229 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 17:24:38 -0000 Before 44d488477902f0786d6bce44b74713f1713a34a9 combination of GRUB_HIDDEN_TIMEOUT=0 and GRUB_TIMEOUT!=0 resulted in normal menu with timeout. Now due to GRUB_HIDDEN_TIMEOUT taking precedence, it will always set timeout to 0 and immediately load default entry. To ensure that update does not break existing configuration, refactor make_timeout code. We have a) GRUB_TIMEOUT_STYLE set - assume new code b) GRUB_HIDDEN_TIMEOUT > 0 - use existing logic to set GRUB_TIMEOUT_STYLE to hidden|countdown c) GRUB_HIDDEN_TIMEOUT = 0 - set GRUB_TIMOUT_STYLE to menu There is no need to have special case for GRUB_TIMEOUT_STYLE not set - it is the same as having it set to menu, so consolidate it with previous code. --- util/grub.d/00_header.in | 58 +++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in index d2e7252..0c82f23 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -282,48 +282,50 @@ fi make_timeout () { - if [ "x${1}${3}" != "x" ] ; then - if [ "x${3}" != "x" ] ; then - timeout="${2}" - style="${3}" - else - # Handle the deprecated GRUB_HIDDEN_TIMEOUT scheme. - timeout="${1}" - if [ "x${2}" != "x0" ] ; then - grub_warn "$(gettext "Setting GRUB_TIMEOUT to a non-zero value when GRUB_HIDDEN_TIMEOUT is set is no longer supported.")" - fi - if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then - style="hidden" - else - style="countdown" - fi + if [ "x${3}" != "x" ] ; then + timeout="${2}" + style="${3}" + elif [ "x${1}" != "x" -a "x${1}" != "x0" ] ; then + # Handle the deprecated GRUB_HIDDEN_TIMEOUT scheme. + timeout="${1}" + if [ "x${2}" != "x0" ] ; then + grub_warn "$(gettext "Setting GRUB_TIMEOUT to a non-zero value when GRUB_HIDDEN_TIMEOUT is set is no longer supported.")" fi - if [ "x${style}" = "xcountdown" ] ; then - verbose=" --verbose" - else + if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then + style="hidden" verbose= + else + style="countdown" + verbose=" --verbose" fi - cat << EOF + else + # No hidden timeout, so treat as GRUB_TIMEOUT_STYLE=menu + timeout="${2}" + style="menu" + fi + cat << EOF if [ x\$feature_timeout_style = xy ] ; then set timeout_style=${style} set timeout=${timeout} EOF - if [ "x${style}" != "xmenu" ] ; then - cat << EOF + if [ "x${style}" = "xmenu" ] ; then + cat << EOF +# Fallback normal timeout code in case the timeout_style feature is +# unavailable. +else + set timeout=${timeout} +EOF + else + cat << EOF # Fallback hidden-timeout code in case the timeout_style feature is # unavailable. elif sleep${verbose} --interruptible ${timeout} ; then set timeout=0 EOF - fi - cat << EOF + fi + cat << EOF fi EOF - else - cat << EOF -set timeout=${2} -EOF - fi } if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then -- tg: (bb05e31..) u/fix-hidden-timeout (depends on: master)