From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UOos6-00088s-DT for mharc-grub-devel@gnu.org; Sun, 07 Apr 2013 08:38:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOos2-00088E-Qy for grub-devel@gnu.org; Sun, 07 Apr 2013 08:38:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UOorw-0003iM-Vd for grub-devel@gnu.org; Sun, 07 Apr 2013 08:38:54 -0400 Received: from mail.gw90.de ([188.40.100.199]:42684) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOorw-0003fZ-Lx for grub-devel@gnu.org; Sun, 07 Apr 2013 08:38:48 -0400 Received: from e178075116.adsl.alicedsl.de ([85.178.75.116] helo=[192.168.2.49]) by mail.gw90.de with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1UOorr-0003dQ-0J for grub-devel@gnu.org; Sun, 07 Apr 2013 12:38:43 +0000 Message-ID: <1365338320.7207.35.camel@mattotaupa> Subject: Re: [PATCH] reimplement grub-reboot to nor depend on GRUB_DEFAULT=saved From: Paul Menzel To: grub-devel@gnu.org Date: Sun, 07 Apr 2013 14:38:40 +0200 In-Reply-To: <20130407143439.6675fd5a@opensuse.site> References: <1359536919-25986-1-git-send-email-arvidjaar@gmail.com> <51607CEF.2030408@gmail.com> <20130407143439.6675fd5a@opensuse.site> Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-rBgsSI4F0jRgDsYqMMr+" X-Mailer: Evolution 3.4.4-3 Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 188.40.100.199 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: Sun, 07 Apr 2013 12:38:57 -0000 --=-rBgsSI4F0jRgDsYqMMr+ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Am Sonntag, den 07.04.2013, 14:34 +0400 schrieb Andrey Borzenkov: > =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: > >=20 > > > + savenev next_entry > > > + savenev next_entry > >=20 > > Have you actually tested this patch? This is not a correct comand name. > >=20 >=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 s,nor,not, > 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. s,consequitive,consecutive, >=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. *variab*l*e > + > 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 boot= only."; echo > - gettext_printf "This requires setting GRUB_DEFAULT=3Dsaved in %s/def= ault/grub.\n" "$sysconfdir" > - echo > print_option_help "-h, --help" "$(gettext "print this message and ex= it")" > print_option_help "-v, --version" "$(gettext "print the version info= rmation and exit")" > dirmsg=3D"$(gettext_printf "expect GRUB images under the directory D= IR/%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/^s= aved_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/^p= rev_saved_entry=3D//p'` > if [ "$prev_saved_entry" ]; then > - $grub_editenv ${grubdir}/grubenv set prev_saved_entry=3D"$prev_saved= _entry" > -else > - # We need some non-empty value for prev_saved_entry so that GRUB wil= l > - # recognise that grub-reboot has been used and restore the previous > - # saved entry. "0" is the same as an empty value, i.e. the first men= u > - # entry. > - $grub_editenv ${grubdir}/grubenv set prev_saved_entry=3D0 > + $grub_editenv ${grubdir}/grubenv set saved_entry=3D"$prev_saved_entr= y" > + $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 <