From 9fd4e14e7a473ac1d83a60abe63a9100cb18cb6a Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Fri, 22 May 2015 20:09:12 +0300
Subject: use xorriso for proper efi metadata

---
 images/NEWS          | 2 ++
 images/make_boot_img | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/images/NEWS b/images/NEWS
index 417c271a1..cc865959d 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- use xorriso for proper efi metadata
+
 Version 2.25 - 9 May 2015 by Thomas Backlund
 
 - update UEFI menu
diff --git a/images/make_boot_img b/images/make_boot_img
index 4df1b4794..b00069b5d 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -347,7 +347,7 @@ sub boot_iso {
 
     my $arch = arch();
     my $options = "-J -joliet-long -r -v -T -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table";
-    my $cmd = "mkisofs -U -A 'Mageia-$ENV{DISTRIB_VERSION}-$arch-netinstall' -V 'Mageia-$ENV{DISTRIB_VERSION}-$arch-netinstall' -volset 'Mageia-$ENV{DISTRIB_VERSION}-$arch' $options";
+    my $cmd = "xorriso -as mkisofs -U -A 'Mageia-$ENV{DISTRIB_VERSION}-$arch-netinstall' -V 'Mageia-$ENV{DISTRIB_VERSION}-$arch-netinstall' -volset 'Mageia-$ENV{DISTRIB_VERSION}-$arch' $options";
     # create efi stuff on the fly
     if ($arch =~ /x86_64/) {
        _ "mkdir -p .boot_iso/EFI/BOOT/";
@@ -371,7 +371,7 @@ sub boot_iso {
        _ "/sbin/mkdosfs -F12 $efi_img";
        _ "mcopy -s -i $efi_img .boot_iso/EFI ::";
        # create iso
-       _ "$cmd -eltorito-alt-boot -b isolinux/efiboot.img -no-emul-boot -o $iso .boot_iso";
+       _ "$cmd -eltorito-alt-boot -e isolinux/efiboot.img -no-emul-boot -o $iso .boot_iso";
     } else {
        _ "$cmd -o $iso .boot_iso";
     }
-- 
cgit v1.2.1