Blame SOURCES/0115-Use-linux16-when-appropriate-880840.patch

f731ee
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
f731ee
From: Peter Jones <pjones@redhat.com>
f731ee
Date: Mon, 28 Oct 2013 10:05:07 -0400
f731ee
Subject: [PATCH] Use linux16 when appropriate (#880840)
f731ee
f731ee
The kernel group really would prefer that we use the 16 bit entry point
f731ee
on x86 bios machines.
f731ee
f731ee
Resolves: rhbz#880840
f731ee
f731ee
Signed-off-by: Peter Jones <pjones@redhat.com>
f731ee
---
f731ee
 util/grub.d/10_linux.in | 9 +++++++--
f731ee
 1 file changed, 7 insertions(+), 2 deletions(-)
f731ee
f731ee
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
f731ee
index e762e1f4e37..600bfd29dc7 100644
f731ee
--- a/util/grub.d/10_linux.in
f731ee
+++ b/util/grub.d/10_linux.in
f731ee
@@ -74,6 +74,11 @@ linux_entry ()
f731ee
   type="$3"
f731ee
   args="$4"
f731ee
 
f731ee
+  sixteenbit=""
f731ee
+  case "$machine" in
f731ee
+    i?86|x86_64) sixteenbit="16" ;;
f731ee
+  esac
f731ee
+
f731ee
   if [ -z "$boot_device_id" ]; then
f731ee
       boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
f731ee
   fi
f731ee
@@ -132,7 +137,7 @@ linux_entry ()
f731ee
 EOF
f731ee
   else
f731ee
     sed "s/^/$submenu_indentation/" << EOF
f731ee
-	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
f731ee
+	linux${sixteenbit} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
f731ee
 EOF
f731ee
   fi
f731ee
   if test -n "${initrd}" ; then
f731ee
@@ -142,7 +147,7 @@ EOF
f731ee
 EOF
f731ee
     else
f731ee
       sed "s/^/$submenu_indentation/" << EOF
f731ee
-	initrd	${rel_dirname}/${initrd}
f731ee
+	initrd${sixteenbit} ${rel_dirname}/${initrd}
f731ee
 EOF
f731ee
     fi
f731ee
   fi