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

* util/grub.d/10_hurd.in: Don't call savedefault on recovery entries.

Browse source 
* util/grub.d/10_kfreebsd.in: Likewise.
	* util/grub.d/10_linux.in: Likewise.
	* util/grub.d/20_linux_xen.in: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-11-01 12:49:40 +01:00
parent 6428dec358
commit 74aaf558ef
5 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2010-11-01 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub.d/10_hurd.in: Don't call savedefault on recovery entries.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.
2010-11-01 Vladimir Serbinenko <phcoder@gmail.com> 2010-11-01 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/arg.c (grub_arg_parse): Avoid interpreting direct * grub-core/lib/arg.c (grub_arg_parse): Avoid interpreting direct

1
util/grub.d/10_hurd.in
View file

@ -107,7 +107,6 @@ EOF
echo '$(gettext_quoted "Loading GNU Mach ...")' echo '$(gettext_quoted "Loading GNU Mach ...")'
multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/} -s multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/} -s
EOF EOF
save_default_entry | sed -e "s/^/\t/"
prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
cat << EOF cat << EOF
echo '$(gettext_quoted "Loading the Hurd ...")' echo '$(gettext_quoted "Loading the Hurd ...")'

4
util/grub.d/10_kfreebsd.in
View file

@ -76,7 +76,9 @@ kfreebsd_entry ()
title="$(gettext_quoted "%s, with kFreeBSD %s")" title="$(gettext_quoted "%s, with kFreeBSD %s")"
fi fi
printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"
save_default_entry | sed -e "s/^/\t/" if ! ${recovery} ; then
save_default_entry | sed -e "s/^/\t/"
fi
if [ -z "${prepare_boot_cache}" ]; then if [ -z "${prepare_boot_cache}" ]; then
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
fi fi

4
util/grub.d/10_linux.in
View file

@ -63,7 +63,9 @@ linux_entry ()
title="$(gettext_quoted "%s, with Linux %s")" title="$(gettext_quoted "%s, with Linux %s")"
fi fi
printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"
save_default_entry | sed -e "s/^/\t/" if ! ${recovery} ; then
save_default_entry | sed -e "s/^/\t/"
fi
# Use ELILO's generic "efifb" when it's known to be available. # Use ELILO's generic "efifb" when it's known to be available.
# FIXME: We need an interface to select vesafb in case efifb can't be used. # FIXME: We need an interface to select vesafb in case efifb can't be used.

4
util/grub.d/20_linux_xen.in
View file

@ -65,7 +65,9 @@ linux_entry ()
title="$(gettext_quoted "%s, with Linux %s and XEN %s")" title="$(gettext_quoted "%s, with Linux %s and XEN %s")"
fi fi
printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" "${xen_version}" printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" "${xen_version}"
save_default_entry | sed -e "s/^/\t/" if ! ${recovery} ; then
save_default_entry | sed -e "s/^/\t/"
fi
if [ -z "${prepare_boot_cache}" ]; then if [ -z "${prepare_boot_cache}" ]; then
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"