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

* util/grub.d/20_linux_xen.in (linux_entry): Correctly capitalize

Browse source 
Xen and reorder menu item wording to make it clearer that this entry
will launch Xen.  Print separate messages when loading Xen and
Linux.
This commit is contained in:
Ian Campbell 2010-12-31 22:49:42 +00:00 committed by Colin Watson
parent 275bff5f00
commit 1b394975e9
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2010-12-31 Ian Campbell <ijc@hellion.org.uk>
* util/grub.d/20_linux_xen.in (linux_entry): Correctly capitalize
Xen and reorder menu item wording to make it clearer that this entry
will launch Xen. Print separate messages when loading Xen and
Linux.
2010-12-31 Vladimir Serbinenko <phcoder@gmail.com> 2010-12-31 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/partmap/amiga.c (GRUB_AMIGA_PART_MAGIC): New define. * grub-core/partmap/amiga.c (GRUB_AMIGA_PART_MAGIC): New define.

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

@ -60,11 +60,11 @@ linux_entry ()
args="$5" args="$5"
xen_args="$6" xen_args="$6"
if ${recovery} ; then if ${recovery} ; then
title="$(gettext_quoted "%s, with Linux %s and XEN %s (recovery mode)")" title="$(gettext_quoted "%s, with Xen %s and Linux %s (recovery mode)")"
else else
title="$(gettext_quoted "%s, with Linux %s and XEN %s")" title="$(gettext_quoted "%s, with Xen %s and Linux %s")"
fi fi
printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" "${xen_version}" printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${xen_version}" "${version}"
if ! ${recovery} ; then if ! ${recovery} ; then
save_default_entry | sed -e "s/^/\t/" save_default_entry | sed -e "s/^/\t/"
fi fi
@ -73,10 +73,12 @@ linux_entry ()
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
printf '%s\n' "${prepare_boot_cache}" printf '%s\n' "${prepare_boot_cache}"
message="$(gettext_printf "Loading Linux %s ..." ${version})" xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
cat << EOF cat << EOF
echo '$message' echo '$xmessage'
multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args}
echo '$lmessage'
module ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args} module ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
EOF EOF
if test -n "${initrd}" ; then if test -n "${initrd}" ; then