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

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>

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 083bcef..0cb0f4e 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -210,8 +210,13 @@ while [ "x${xen_list}" != "x" ] ; do
        xen_loader="xen_hypervisor"
        module_loader="xen_module"
     else
-       xen_loader="multiboot"
-       module_loader="module"
+       if ($grub_file --is-x86-multiboot2 $current_xen); then
+           xen_loader="multiboot2"
+           module_loader="module2"
+       else
+           xen_loader="multiboot"
+           module_loader="module"
+        fi
     fi
     while [ "x$list" != "x" ] ; do
        linux=`version_find_latest $list`