From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UYkn8-0001il-KP for mharc-grub-devel@gnu.org; Sat, 04 May 2013 18:18:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UYkn5-0001iE-F7 for grub-devel@gnu.org; Sat, 04 May 2013 18:18:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UYkn4-0003YZ-17 for grub-devel@gnu.org; Sat, 04 May 2013 18:18:51 -0400 Received: from mail-ee0-f42.google.com ([74.125.83.42]:39604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UYkn3-0003YV-OO for grub-devel@gnu.org; Sat, 04 May 2013 18:18:49 -0400 Received: by mail-ee0-f42.google.com with SMTP id c13so1207811eek.1 for ; Sat, 04 May 2013 15:18:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:x-enigmail-version:content-type; bh=CQWRNAVwLU6xciti0JPN+aTJ9prU5QT4rn+MJ0Tz1Y4=; b=ZD5+kBHijncc0wlu1RyGKIv7cRACbw4cGS3FNil9B18Z+3/w5GUZZBCX7fwg3GxPHm GSFQUDALEJzyr3j2HeD5HmlcQ1GOEctou594vHTL700XqNqxUF/u9EFCYjpZFrpR0faY tMRSSvZlfSnDahWMcvVc8OxJwiTJjeEz1H+FPAm2mhyWRmKIuYJtOEYM7DkM/jx7wnP4 2RWB5xLOmFRcgGtUANkT1KigC4ZygcOVkL7kOhf4R7H4/xOi+4g4oFGCcQQX7YUv3n79 JDFjcWBWoVc3TEfQLAkUUX98TKOe2DCEeXIZ1Vp0aJ4m9emQowWtf3juhWswxLVP36mR ZnJA== X-Received: by 10.15.33.195 with SMTP id c43mr4191912eev.2.1367705929002; Sat, 04 May 2013 15:18:49 -0700 (PDT) Received: from debian.x201.phnet (245-188.1-85.cust.bluewin.ch. [85.1.188.245]) by mx.google.com with ESMTPSA id e2sm12971821eem.16.2013.05.04.15.18.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 04 May 2013 15:18:48 -0700 (PDT) Message-ID: <51858946.9030401@gmail.com> Date: Sun, 05 May 2013 00:18:46 +0200 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.12) Gecko/20130116 Icedove/10.0.12 MIME-Version: 1.0 To: grub-devel@gnu.org Subject: Re: [PATCH] reimplement grub-reboot to nor depend on GRUB_DEFAULT=saved References: <1359536919-25986-1-git-send-email-arvidjaar@gmail.com> <51607CEF.2030408@gmail.com> <20130407143439.6675fd5a@opensuse.site> In-Reply-To: <20130407143439.6675fd5a@opensuse.site> X-Enigmail-Version: 1.4.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enigC48D01F0261B920965E9D5EB" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.83.42 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, 04 May 2013 22:18:53 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigC48D01F0261B920965E9D5EB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Go ahead. On 07.04.2013 12:34, Andrey Borzenkov wrote: > =D0=92 Sat, 06 Apr 2013 21:52:15 +0200 > Vladimir '=CF=86-coder/phcoder' Serbinenko =D0=BF=D0= =B8=D1=88=D0=B5=D1=82: >=20 >> On 30.01.2013 10:08, Andrey Borzenkov wrote: >> >>> + savenev next_entry >>> + savenev next_entry >> >> Have you actually tested this patch? This is not a correct comand name= =2E >> >=20 > Not really; it was more a question "would this even be considered". >=20 > Here is updated patch which I actually did test :) >=20 > From: Andrey Borzenkov > Subject: [PATCH] reimplement grub-reboot to nor depend on GRUB_DEFAULT=3D= saved > To: grub-devel@gnu.org >=20 > Use separate environment variable next_entry to indicate one time > boot entry. CMOS button still takes precedent. It makes grub-reboot > usable also when GRUB_DEFAULT is set to explicit value. >=20 > It retains support for prev_saved_entry for compatibility. Also > grub-reboot will restore saved_entry from prev_saved_entry first time > it is called. >=20 > As a side effect it also fixes a problem that saved_entry is lost > after two consequitive grub-reboot calls. >=20 > Signed-off-by: Andrey Borzenkov >=20 > --- > ChangeLog | 5 +++++ > util/grub-reboot.in | 17 ++++++----------- > util/grub-set-default.in | 1 + > util/grub.d/00_header.in | 14 +++++++++++++- > 4 files changed, 25 insertions(+), 12 deletions(-) >=20 > diff --git a/ChangeLog b/ChangeLog > index 9163911..df12f4b 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,8 @@ > +2013-04-07 Andrey Borzenkov > + > + Reimplement grub-reboot to not depend on saved_entry. Use next_entry > + variabe for one time boot menu entry. > + > 2013-04-06 Andrey Borzenkov > =20 > * conf/Makefile.extra-dist (EXTRA_DIST): Add > diff --git a/util/grub-reboot.in b/util/grub-reboot.in > index 1a91d36..d132e4f 100644 > --- a/util/grub-reboot.in > +++ b/util/grub-reboot.in > @@ -46,8 +46,6 @@ export TEXTDOMAINDIR=3D"@localedir@" > usage () { > gettext_printf "Usage: %s [OPTION] MENU_ENTRY\n" "$self" > gettext "Set the default boot menu entry for GRUB, for the next bo= ot only."; echo > - gettext_printf "This requires setting GRUB_DEFAULT=3Dsaved in %s/d= efault/grub.\n" "$sysconfdir" > - echo > print_option_help "-h, --help" "$(gettext "print this message and = exit")" > print_option_help "-v, --version" "$(gettext "print the version in= formation and exit")" > dirmsg=3D"$(gettext_printf "expect GRUB images under the directory= DIR/%s instead of the %s directory" "@grubdirname@" "$grubdir")" > @@ -129,17 +127,14 @@ fi > =20 > grubdir=3D`echo "${bootdir}/@grubdirname@" | sed 's,//*,/,g'` > =20 > -prev_saved_entry=3D`$grub_editenv ${grubdir}/grubenv list | sed -n 's/= ^saved_entry=3D//p'` > +# Restore saved_entry if it was set by previous version > +prev_saved_entry=3D`$grub_editenv ${grubdir}/grubenv list | sed -n 's/= ^prev_saved_entry=3D//p'` > if [ "$prev_saved_entry" ]; then > - $grub_editenv ${grubdir}/grubenv set prev_saved_entry=3D"$prev_sav= ed_entry" > -else > - # We need some non-empty value for prev_saved_entry so that GRUB w= ill > - # recognise that grub-reboot has been used and restore the previou= s > - # saved entry. "0" is the same as an empty value, i.e. the first m= enu > - # entry. > - $grub_editenv ${grubdir}/grubenv set prev_saved_entry=3D0 > + $grub_editenv ${grubdir}/grubenv set saved_entry=3D"$prev_saved_en= try" > + $grub_editenv ${grubdir}/grubenv unset prev_saved_entry > fi > -$grub_editenv ${grubdir}/grubenv set saved_entry=3D"$entry" > + > +$grub_editenv ${grubdir}/grubenv set next_entry=3D"$entry" > =20 > # Bye. > exit 0 > diff --git a/util/grub-set-default.in b/util/grub-set-default.in > index ea18da1..d607318 100644 > --- a/util/grub-set-default.in > +++ b/util/grub-set-default.in > @@ -130,6 +130,7 @@ fi > grubdir=3D`echo "${bootdir}/@grubdirname@" | sed 's,//*,/,g'` > =20 > $grub_editenv ${grubdir}/grubenv unset prev_saved_entry > +$grub_editenv ${grubdir}/grubenv unset next_entry > $grub_editenv ${grubdir}/grubenv set saved_entry=3D"$entry" > =20 > # Bye. > diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in > index 3da5d12..2c4bb0a 100644 > --- a/util/grub.d/00_header.in > +++ b/util/grub.d/00_header.in > @@ -51,13 +51,25 @@ if [ "x$GRUB_BUTTON_CMOS_ADDRESS" !=3D "x" ]; then > cat < if cmostest $GRUB_BUTTON_CMOS_ADDRESS ; then > set default=3D"${GRUB_DEFAULT_BUTTON}" > +elif [ "\${next_entry}" ] ; then > + set default=3D"\${next_entry}" > + set next_entry=3D > + save_env next_entry > + set boot_once=3Dtrue > else > set default=3D"${GRUB_DEFAULT}" > fi > EOF > else > cat < -set default=3D"${GRUB_DEFAULT}" > +if [ "\${next_entry}" ] ; then > + set default=3D"\${next_entry}" > + set next_entry=3D > + save_env next_entry > + set boot_once=3Dtrue > +else > + set default=3D"${GRUB_DEFAULT}" > +fi > EOF > fi > cat <=20 >=20 >=20 > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > https://lists.gnu.org/mailman/listinfo/grub-devel --------------enigC48D01F0261B920965E9D5EB 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.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAlGFiUYACgkQNak7dOguQgnovwEAn3kvB+x9vu1RSwPnRIUNTi8b nz9UPBSLyrNRz6lzu0QBAIWKT336hIrfSKP3PnJdwzsj4t0UeSnraBarL4cCrQDK =sIdx -----END PGP SIGNATURE----- --------------enigC48D01F0261B920965E9D5EB--