grub2/0109-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
Peter Jones 5a73eab265 Backport a pile of fixes from the f29 tree.
Related: rhbz#1609431

Signed-off-by: Peter Jones <pjones@redhat.com>
2018-08-02 16:21:44 -04:00

31 lines
1.2 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 19 Oct 2017 11:29:11 -0400
Subject: [PATCH] 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 bcdc3ceac02..2bc03fd36b9 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -136,6 +136,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}
@@ -145,6 +147,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