vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use grub-file to figure out whether multiboot2 should be used for Xen.gz

Browse source 
The multiboot2 is much more preferable than multiboot. Especiall
if booting under EFI where multiboot does not have the functionality
to pass ImageHandler.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Konrad Rzeszutek Wilk 2017-08-29 16:40:53 -04:00 committed by Vincent Batts
parent 90d8ca6970
commit e8a9a2a1aa
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
util/grub.d/20_linux_xen.in
View file

@ -209,10 +209,15 @@ while [ "x${xen_list}" != "x" ] ; do
if ($grub_file --is-arm64-efi $current_xen); then if ($grub_file --is-arm64-efi $current_xen); then
xen_loader="xen_hypervisor" xen_loader="xen_hypervisor"
module_loader="xen_module" module_loader="xen_module"
else
if ($grub_file --is-x86-multiboot2 $current_xen); then
xen_loader="multiboot2"
module_loader="module2"
else else
xen_loader="multiboot" xen_loader="multiboot"
module_loader="module" module_loader="module"
fi fi
fi
while [ "x$list" != "x" ] ; do while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list` linux=`version_find_latest $list`
gettext_printf "Found linux image: %s\n" "$linux" >&2 gettext_printf "Found linux image: %s\n" "$linux" >&2