fa8b2484d0
- 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>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From b0260d2f586390b19294f5b98194c9e78a33ccad Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 19 Oct 2017 11:29:11 -0400
|
|
Subject: [PATCH 196/198] 20_linux_xen: load xen or multiboot{,2} modules as
|
|
needed.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
util/grub.d/20_linux_xen.in | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
|
|
index fae1ffe94..fc53bd542 100644
|
|
--- a/util/grub.d/20_linux_xen.in
|
|
+++ b/util/grub.d/20_linux_xen.in
|
|
@@ -126,6 +126,8 @@ linux_entry ()
|
|
else
|
|
xen_rm_opts="no-real-mode edd=off"
|
|
fi
|
|
+ insmod ${module_loader}
|
|
+ insmod ${xen_loader}
|
|
${xen_loader} ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
|
|
echo '$(echo "$lmessage" | grub_quote)'
|
|
${module_loader} ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
|
|
@@ -135,6 +137,7 @@ EOF
|
|
message="$(gettext_printf "Loading initial ramdisk ...")"
|
|
sed "s/^/$submenu_indentation/" << EOF
|
|
echo '$(echo "$message" | grub_quote)'
|
|
+ insmod ${module_loader}
|
|
${module_loader} --nounzip ${rel_dirname}/${initrd}
|
|
EOF
|
|
fi
|
|
--
|
|
2.14.3
|
|
|