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).
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

View file

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