Blame SOURCES/0071-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch

5593c8
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
5593c8
From: Peter Jones <pjones@redhat.com>
5593c8
Date: Tue, 9 Jul 2019 14:31:19 +0200
5593c8
Subject: [PATCH] 20_linux_xen: load xen or multiboot{,2} modules as needed.
5593c8
5593c8
Signed-off-by: Peter Jones <pjones@redhat.com>
5593c8
---
5593c8
 util/grub.d/20_linux_xen.in | 5 +++++
5593c8
 1 file changed, 5 insertions(+)
5593c8
5593c8
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
5593c8
index e9e73b815fb..c23b064be6c 100644
5593c8
--- a/util/grub.d/20_linux_xen.in
5593c8
+++ b/util/grub.d/20_linux_xen.in
5593c8
@@ -153,6 +153,7 @@ linux_entry_xsm ()
5593c8
         else
5593c8
             xen_rm_opts="no-real-mode edd=off"
5593c8
         fi
5593c8
+	insmod ${xen_module}
5593c8
 	${xen_loader}	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
5593c8
 	echo	'$(echo "$lmessage" | grub_quote)'
5593c8
 	${module_loader}	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
5593c8
@@ -166,6 +167,7 @@ EOF
5593c8
     done
5593c8
     sed "s/^/$submenu_indentation/" << EOF
5593c8
 	echo	'$(echo "$message" | grub_quote)'
5593c8
+	insmod ${xen_module}
5593c8
 	${module_loader}	--nounzip   $(echo $initrd_path)
5593c8
 EOF
5593c8
   fi
5593c8
@@ -253,13 +255,16 @@ while [ "x${xen_list}" != "x" ] ; do
5593c8
 	echo "	submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {"
5593c8
     fi
5593c8
     if ($grub_file --is-arm64-efi $current_xen); then
5593c8
+	xen_module="xen_boot"
5593c8
 	xen_loader="xen_hypervisor"
5593c8
 	module_loader="xen_module"
5593c8
     else
5593c8
 	if ($grub_file --is-x86-multiboot2 $current_xen); then
5593c8
+	    xen_module="multiboot2"
5593c8
 	    xen_loader="multiboot2"
5593c8
 	    module_loader="module2"
5593c8
 	else
5593c8
+	    xen_module="multiboot"
5593c8
 	    xen_loader="multiboot"
5593c8
 	    module_loader="module"
5593c8
         fi