From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VvUoe-0003B5-BV for mharc-grub-devel@gnu.org; Tue, 24 Dec 2013 11:26:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VvUoW-0003Ay-0B for grub-devel@gnu.org; Tue, 24 Dec 2013 11:26:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VvUoP-0000Oz-74 for grub-devel@gnu.org; Tue, 24 Dec 2013 11:26:35 -0500 Received: from mail-ee0-x230.google.com ([2a00:1450:4013:c00::230]:61955) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VvUoP-0000OD-0A for grub-devel@gnu.org; Tue, 24 Dec 2013 11:26:29 -0500 Received: by mail-ee0-f48.google.com with SMTP id e49so2929441eek.35 for ; Tue, 24 Dec 2013 08:26:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type; bh=2kQ9VZyFRXGx0D8IATBmKendNvVj0PdzSvqisUdHDeA=; b=vY77fjpYa4HDP3I2wAJjzlFQak+Lm1HEMvfOyyUkmemgidrLkUfyLtuM607UDO4ISU RUHr14z0sM3zX0mn/Yqk68lleHEymh5aT4BZvm1FpohRpsebKELBH33l7ypU9mgcX2kB beaYIvhOusIlA3/BW7CuYj0r0qQPwYSbK4wxFqYr5iKHHGo2xLAEedU0MknmzXrW10xX Yw6OHNbiIJecUgPzU8WZ428wbALZXVp1qmXo+0OCGpX9Ev0CsGUEPbDzoCSbOMewfQWx 2pJMMwYYT2MIA6C8+5WmY4HWp20OLBstpGnxt7/HesI+1WIuQTRgXwu61E63Uv+uNOXT GZfw== X-Received: by 10.14.221.193 with SMTP id r41mr3133919eep.92.1387902388225; Tue, 24 Dec 2013 08:26:28 -0800 (PST) Received: from [192.168.1.16] (85-188.196-178.cust.bluewin.ch. [178.196.188.85]) by mx.google.com with ESMTPSA id b41sm56269796eef.16.2013.12.24.08.26.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 24 Dec 2013 08:26:26 -0800 (PST) Message-ID: <52B9B5B1.7030101@gmail.com> Date: Tue, 24 Dec 2013 17:26:25 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131103 Icedove/17.0.10 MIME-Version: 1.0 To: The development of GNU GRUB Subject: Re: [PATCH] fix timeout handling with GRUB_HIDDEN_TIMEOUT=0 References: <1386437059-25559-1-git-send-email-arvidjaar@gmail.com> In-Reply-To: <1386437059-25559-1-git-send-email-arvidjaar@gmail.com> X-Enigmail-Version: 1.6 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="fp0wMCJtOWKGivmI8q7uwKBv0CaIcM1kH" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::230 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: Tue, 24 Dec 2013 16:26:42 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --fp0wMCJtOWKGivmI8q7uwKBv0CaIcM1kH Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Committed, thanks On 07.12.2013 18:24, Andrey Borzenkov wrote: > util/grub.d/00_header.in | 58 +++++++++++++++++++++++++---------------= -------- > 1 file changed, 30 insertions(+), 28 deletions(-) >=20 > 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 > =20 > make_timeout () > { > - if [ "x${1}${3}" !=3D "x" ] ; then > - if [ "x${3}" !=3D "x" ] ; then > - timeout=3D"${2}" > - style=3D"${3}" > - else > - # Handle the deprecated GRUB_HIDDEN_TIMEOUT scheme. > - timeout=3D"${1}" > - if [ "x${2}" !=3D "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}" =3D "xtrue" ] ; then > - style=3D"hidden" > - else > - style=3D"countdown" > - fi > + if [ "x${3}" !=3D "x" ] ; then > + timeout=3D"${2}" > + style=3D"${3}" > + elif [ "x${1}" !=3D "x" -a "x${1}" !=3D "x0" ] ; then > + # Handle the deprecated GRUB_HIDDEN_TIMEOUT scheme. > + timeout=3D"${1}" > + if [ "x${2}" !=3D "x0" ] ; then > + grub_warn "$(gettext "Setting GRUB_TIMEOUT to a non-zero value wh= en GRUB_HIDDEN_TIMEOUT is set is no longer supported.")" > fi > - if [ "x${style}" =3D "xcountdown" ] ; then > - verbose=3D" --verbose" > - else > + if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" =3D "xtrue" ] ; then > + style=3D"hidden" > verbose=3D > + else > + style=3D"countdown" > + verbose=3D" --verbose" > fi > - cat << EOF > + else > + # No hidden timeout, so treat as GRUB_TIMEOUT_STYLE=3Dmenu > + timeout=3D"${2}" > + style=3D"menu" > + fi > + cat << EOF > if [ x\$feature_timeout_style =3D xy ] ; then > set timeout_style=3D${style} > set timeout=3D${timeout} > EOF > - if [ "x${style}" !=3D "xmenu" ] ; then > - cat << EOF > + if [ "x${style}" =3D "xmenu" ] ; then > + cat << EOF > +# Fallback normal timeout code in case the timeout_style feature is > +# unavailable. > +else > + set timeout=3D${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=3D0 > EOF > - fi > - cat << EOF > + fi > + cat << EOF > fi > EOF > - else > - cat << EOF > -set timeout=3D${2} > -EOF > - fi > } > =20 > if [ "x$GRUB_BUTTON_CMOS_ADDRESS" !=3D "x" ]; then > -- tg: (bb05e31..) u/fix-hidden-timeout (depends on: master) --fp0wMCJtOWKGivmI8q7uwKBv0CaIcM1kH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iF4EAREKAAYFAlK5tbEACgkQmBXlbbo5nOsn/wEAlwz2SkJrxW0q9MV/gHAKGhMV RnruWzPciLiLzAZbwRcA/3VsaUhFXgcZs35XhDdO/8k61fRlNltEGo5ofI8xjBKG =yoYs -----END PGP SIGNATURE----- --fp0wMCJtOWKGivmI8q7uwKBv0CaIcM1kH--