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

diff --git a/ChangeLog b/ChangeLog
index 505c1cc0d6c6734f5f5f90b61346be4165ca2ff3..9881baee9ee765e6baf381765af51837a3527185 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * grub-core/partmap/amiga.c (GRUB_AMIGA_PART_MAGIC): New define.

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index a90211f44cdb1ceb96229a256b1956dc4f8679ca..ee49cd9038f10dcd4ae76230755d4dcc9f220159 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -60,11 +60,11 @@ linux_entry ()
   args="$5"
   xen_args="$6"
   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
-    title="$(gettext_quoted "%s, with Linux %s and XEN %s")"
+    title="$(gettext_quoted "%s, with Xen %s and Linux %s")"
   fi
-  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" "${xen_version}"
+  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${xen_version}" "${version}"
   if ! ${recovery} ; then
       save_default_entry | sed -e "s/^/\t/"
   fi
@@ -73,10 +73,12 @@ linux_entry ()
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi
   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
-       echo    '$message'
+       echo    '$xmessage'
        multiboot       ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args}
+       echo    '$lmessage'
        module  ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
 EOF
   if test -n "${initrd}" ; then