dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0231-util-grub.d-20_linux_xen.in-Automatically-add-no-rea.patch

f96e0b
From b138cfd473ab65282af07d400fc95a8a5bc7e22e Mon Sep 17 00:00:00 2001
f96e0b
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
f96e0b
Date: Sun, 24 Mar 2013 14:03:33 +0100
f96e0b
Subject: [PATCH 231/482] 	* util/grub.d/20_linux_xen.in: Automatically
f96e0b
 add no-real-mode edd=off on 	non-BIOS platforms.
f96e0b
f96e0b
---
f96e0b
 ChangeLog                   | 5 +++++
f96e0b
 util/grub.d/20_linux_xen.in | 7 ++++++-
f96e0b
 2 files changed, 11 insertions(+), 1 deletion(-)
f96e0b
f96e0b
diff --git a/ChangeLog b/ChangeLog
f96e0b
index 43dcf93..981991b 100644
f96e0b
--- a/ChangeLog
f96e0b
+++ b/ChangeLog
f96e0b
@@ -1,5 +1,10 @@
f96e0b
 2013-03-24  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
 
f96e0b
+	* util/grub.d/20_linux_xen.in: Automatically add no-real-mode edd=off on
f96e0b
+	non-BIOS platforms.
f96e0b
+
f96e0b
+2013-03-24  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
+
f96e0b
 	* grub-core/Makefile.core.def (vga): Disable on coreboot and multiboot
f96e0b
 	platforms.
f96e0b
 
f96e0b
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
f96e0b
index ac05ee4..6651cbc 100644
f96e0b
--- a/util/grub.d/20_linux_xen.in
f96e0b
+++ b/util/grub.d/20_linux_xen.in
f96e0b
@@ -121,7 +121,12 @@ linux_entry ()
f96e0b
   lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
f96e0b
   sed "s/^/$submenu_indentation/" << EOF
f96e0b
 	echo	'$(echo "$xmessage" | grub_quote)'
f96e0b
-	multiboot	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args}
f96e0b
+        if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then
f96e0b
+            xen_rm_opts=
f96e0b
+        else
f96e0b
+            xen_rm_opts="no-real-mode edd=off"
f96e0b
+        fi
f96e0b
+	multiboot	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
f96e0b
 	echo	'$(echo "$lmessage" | grub_quote)'
f96e0b
 	module	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
f96e0b
 EOF
f96e0b
-- 
f96e0b
1.8.2.1
f96e0b