From e057eb011ab981a32e48c9d4cb3013b1f9ca09c2 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Fri, 22 May 2015 20:15:50 +0300
Subject: generate proper efi isohybrid

---
 images/NEWS          | 1 +
 images/make_boot_img | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'images')

diff --git a/images/NEWS b/images/NEWS
index cc865959d..c19a46fd5 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,4 +1,5 @@
 - use xorriso for proper efi metadata
+- generate proper efi isohybrid
 
 Version 2.25 - 9 May 2015 by Thomas Backlund
 
diff --git a/images/make_boot_img b/images/make_boot_img
index b00069b5d..814308a06 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -372,10 +372,11 @@ sub boot_iso {
        _ "mcopy -s -i $efi_img .boot_iso/EFI ::";
        # create iso
        _ "$cmd -eltorito-alt-boot -e isolinux/efiboot.img -no-emul-boot -o $iso .boot_iso";
+       _ "isohybrid -u $iso";
     } else {
        _ "$cmd -o $iso .boot_iso";
+       _ "isohybrid -o 1 $iso";
     }
-    _ "isohybrid -o 1 $iso";
     rm_rf('.boot_iso');
 }
 
-- 
cgit v1.2.1