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