From 3fe31072fab23e2b3261d46c8c896bfd5bd2214b Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Mon, 8 Feb 2021 13:30:04 +0100 Subject: [PATCH] Fix module loading in the 20_linux_xen script Resolves: rhbz#1858364 Signed-off-by: Javier Martinez Canillas --- ...d-xen-or-multiboot-2-modules-as-need.patch | 32 ++++++++++++++----- grub2.spec | 6 +++- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/0092-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0092-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch index c8e8c4a..b2c7519 100644 --- a/0092-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch +++ b/0092-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch @@ -5,27 +5,43 @@ Subject: [PATCH] 20_linux_xen: load xen or multiboot{,2} modules as needed. Signed-off-by: Peter Jones --- - util/grub.d/20_linux_xen.in | 3 +++ - 1 file changed, 3 insertions(+) + util/grub.d/20_linux_xen.in | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in -index 1519ec692fe..9aa23bc7d51 100644 +index 1519ec692fe..b6e4608db6e 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in -@@ -136,6 +136,8 @@ linux_entry () +@@ -136,6 +136,7 @@ linux_entry () else xen_rm_opts="no-real-mode edd=off" fi -+ insmod ${module_loader} -+ insmod ${xen_loader} ++ insmod ${xen_module} ${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} -@@ -149,6 +151,7 @@ EOF +@@ -149,6 +150,7 @@ EOF done sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$message" | grub_quote)' -+ insmod ${module_loader} ++ insmod ${xen_module} ${module_loader} --nounzip $(echo $initrd_path) EOF fi +@@ -225,13 +227,16 @@ while [ "x${xen_list}" != "x" ] ; do + echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" + fi + if ($grub_file --is-arm64-efi $current_xen); then ++ xen_module="xen_boot" + xen_loader="xen_hypervisor" + module_loader="xen_module" + else + if ($grub_file --is-x86-multiboot2 $current_xen); then ++ xen_module="multiboot2" + xen_loader="multiboot2" + module_loader="module2" + else ++ xen_module="multiboot" + xen_loader="multiboot" + module_loader="module" + fi diff --git a/grub2.spec b/grub2.spec index 646081d..c921bca 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.04 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -516,6 +516,10 @@ rm -r /boot/grub2.tmp/ || : %endif %changelog +* Tue Feb 09 2021 Javier Martinez Canillas - 2.04-32 +- Fix module loading in the 20_linux_xen script + Resolves: rhbz#1858364 + * Mon Aug 31 2020 Javier Martinez Canillas - 2.04-31 - Roll over TFTP block counter to prevent timeouts with data packets Resolves: rhbz#1869335