From d6b229fb8d950d02db6b7cde56641ea29c003cb6 Mon Sep 17 00:00:00 2001
From: Anne Nicolas <ennael@mageia.org>
Date: Wed, 16 Jul 2014 23:10:52 +0200
Subject: add test for isolinux options to manage EFI on x86_64 DVD isos

---
 BCD/Genisoimage.pm | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/BCD/Genisoimage.pm b/BCD/Genisoimage.pm
index 197d201..f410e2d 100644
--- a/BCD/Genisoimage.pm
+++ b/BCD/Genisoimage.pm
@@ -83,19 +83,28 @@ sub create_idx {
 
 sub create_iso {
 	# build the ISO with all args
+	# use -eltorito-alt-boot -b isolinux/efiboot.img -no-emul-boot for EFI
 	print_color("$LOG Building the ISO", $color);
+
+        my $boot ="";
+	if ($nameid eq "Mageia" && $arch eq "x86_64") {
+        	$boot = "-boot-info-table -eltorito-alt-boot -b isolinux/efiboot.img -no-emul-boot";
+	} else {
+        	$boot = "-boot-info-table";
+	}
+
 	my $cmd = "genisoimage $isoconf->{iso}{genisoimage}{options} \\
--A '$isoconf->{iso}{header}{applicationid}' \\
--publisher '$isoconf->{iso}{header}{publisherid}' \\
--sysid '$isoconf->{iso}{header}{systemid}' \\
--p '$isoconf->{iso}{header}{datapreparer}' \\
--volset '$isoconf->{iso}{header}{volumesetid}' \\
--V '$isoconf->{iso}{header}{volumeid}' \\
--o '$isodir/$isoname.iso' \\
--b isolinux/isolinux.bin \\
--boot-info-table \\
-$builddir/../
-";
+	-A '$isoconf->{iso}{header}{applicationid}' \\
+	-publisher '$isoconf->{iso}{header}{publisherid}' \\
+	-sysid '$isoconf->{iso}{header}{systemid}' \\
+	-p '$isoconf->{iso}{header}{datapreparer}' \\
+	-volset '$isoconf->{iso}{header}{volumesetid}' \\
+	-V '$isoconf->{iso}{header}{volumeid}' \\
+	-o '$isodir/$isoname.iso' \\
+	-b isolinux/isolinux.bin \\
+	$boot \\
+	$builddir/../
+	";
 #-quiet \\
 	print_color("\n------------\n $cmd", $color);
 	system($cmd);
-- 
cgit v1.2.1