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-mkconfig_lib.in (save_default_entry): Only set
	saved_entry if boot_once is unset.
	* util/grub.d/00_header.in: Set boot_once to "true" if there was a
	previous saved entry (i.e. grub-reboot).
This commit is contained in:
Colin Watson 2010-01-05 10:30:14 +00:00
parent 6c1f8c1215
commit b445cfaa4d
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog.savedefault
View file

@ -1,3 +1,11 @@
2010-10-05 Jordan Uggla <jordan.uggla@gmail.com>
2010-10-05 Colin Watson <cjwatson@ubuntu.com>
* util/grub-mkconfig_lib.in (save_default_entry): Only set
saved_entry if boot_once is unset.
* util/grub.d/00_header.in: Set boot_once to "true" if there was a
previous saved entry (i.e. grub-reboot).
2009-12-08 Colin Watson <cjwatson@ubuntu.com> 2009-12-08 Colin Watson <cjwatson@ubuntu.com>
* util/grub.d/30_os-prober.in: Call save_default_entry for hurd. * util/grub.d/30_os-prober.in: Call save_default_entry for hurd.

8
util/grub-mkconfig_lib.in
View file

@ -93,8 +93,12 @@ convert_system_path_to_grub_path ()
save_default_entry () save_default_entry ()
{ {
if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then
echo 'set saved_entry=${chosen}' cat << EOF
echo 'save_env saved_entry' if [ -z \${boot_once} ]; then
set saved_entry=${chosen}
save_env saved_entry
fi
EOF
fi fi
} }

1
util/grub.d/00_header.in
View file

@ -48,6 +48,7 @@ if [ \${prev_saved_entry} ]; then
save_env saved_entry save_env saved_entry
set prev_saved_entry= set prev_saved_entry=
save_env prev_saved_entry save_env prev_saved_entry
set boot_once=true
fi fi
EOF EOF