mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-27 23:34:51 +00:00
ce21efa858
- Pull in fixes for TSC calibration driver preference (prefer pmtimer over PIT) to boot on Apollo Lake systems with no PIT - Fix pmtimer calibration to not take forever to fail on kvm. Signed-off-by: Peter Jones <pjones@redhat.com>
52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
From aedb9655a10717fe3678a9e2fc720b55f5b0ffbc Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 28 Oct 2013 10:05:07 -0400
|
|
Subject: [PATCH 052/123] Use linux16 when appropriate (#880840)
|
|
|
|
The kernel group really would prefer that we use the 16 bit entry point
|
|
on x86 bios machines.
|
|
|
|
Resolves: rhbz#880840
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
util/grub.d/10_linux.in | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
index a3d9711d6..f3bf6acd8 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -76,6 +76,11 @@ linux_entry ()
|
|
type="$3"
|
|
args="$4"
|
|
|
|
+ sixteenbit=""
|
|
+ case "$machine" in
|
|
+ i?86|x86_64) sixteenbit="16" ;;
|
|
+ esac
|
|
+
|
|
if [ -z "$boot_device_id" ]; then
|
|
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
|
|
fi
|
|
@@ -134,7 +139,7 @@ linux_entry ()
|
|
EOF
|
|
else
|
|
sed "s/^/$submenu_indentation/" << EOF
|
|
- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
|
|
+ linux${sixteenbit} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
|
|
EOF
|
|
fi
|
|
if test -n "${initrd}" ; then
|
|
@@ -144,7 +149,7 @@ EOF
|
|
EOF
|
|
else
|
|
sed "s/^/$submenu_indentation/" << EOF
|
|
- initrd ${rel_dirname}/${initrd}
|
|
+ initrd${sixteenbit} ${rel_dirname}/${initrd}
|
|
EOF
|
|
fi
|
|
fi
|
|
--
|
|
2.14.3
|
|
|