vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2010-10-05 Jordan Uggla <jordan.uggla@gmail.com>

Browse source 
2010-10-05  Colin Watson  <cjwatson@ubuntu.com>

	* util/grub-reboot.in: Make sure prev_saved_entry always gets a
	non-empty value.
This commit is contained in:
Colin Watson 2010-01-05 11:16:42 +00:00
parent bc11fee9f5
commit cf2fd2a6d1
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog.savedefault
View file

@ -1,3 +1,9 @@
2010-10-05 Jordan Uggla <jordan.uggla@gmail.com>
2010-10-05 Colin Watson <cjwatson@ubuntu.com>
* util/grub-reboot.in: Make sure prev_saved_entry always gets a
non-empty value.
2010-10-05 Jordan Uggla <jordan.uggla@gmail.com>
2010-10-05 Colin Watson <cjwatson@ubuntu.com>

6
util/grub-reboot.in
View file

@ -96,7 +96,11 @@ prev_saved_entry=`$grub_editenv ${grubdir}/grubenv list | sed -n 's/^saved_entry
if [ "$prev_saved_entry" ]; then
$grub_editenv ${grubdir}/grubenv set prev_saved_entry="$prev_saved_entry"
else
$grub_editenv ${grubdir}/grubenv unset prev_saved_entry
# We need some non-empty value for prev_saved_entry so that GRUB will
# 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 menu
# entry.
$grub_editenv ${grubdir}/grubenv set prev_saved_entry=0
fi
$grub_editenv ${grubdir}/grubenv set saved_entry="$entry"