* util/grub.d/20_linux_xen.in: Automatically add no-real-mode edd=off on

	non-BIOS platforms.

diff --git a/ChangeLog b/ChangeLog
index 43dcf9341bcb803c51ae7929d60eb94ba314be22..981991bd702a2e15f2d27655bfebf8807ed69eb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub.d/20_linux_xen.in: Automatically add no-real-mode edd=off on
+       non-BIOS platforms.
+
 2013-03-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/Makefile.core.def (vga): Disable on coreboot and multiboot

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index ac05ee447852a6ef533058f346792b085458d783..6651cbcf01b4edab6a338872aecf2b14e6045407 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -121,7 +121,12 @@ linux_entry ()
   lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
   sed "s/^/$submenu_indentation/" << EOF
        echo    '$(echo "$xmessage" | grub_quote)'
-       multiboot       ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args}
+        if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then
+            xen_rm_opts=
+        else
+            xen_rm_opts="no-real-mode edd=off"
+        fi
+       multiboot       ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
        echo    '$(echo "$lmessage" | grub_quote)'
        module  ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
 EOF