From 9bf84143e21d3a219000cec3b29f7f694f020220 Mon Sep 17 00:00:00 2001
From: Anne Nicolas <ennael@mageia.org>
Date: Tue, 13 Jan 2015 14:53:44 +0100
Subject: include first options for EFI management for DVD 64

---
 BCD/Genisoimage.pm | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

(limited to 'BCD')

diff --git a/BCD/Genisoimage.pm b/BCD/Genisoimage.pm
index 43dfe0d..1ab1f77 100644
--- a/BCD/Genisoimage.pm
+++ b/BCD/Genisoimage.pm
@@ -74,32 +74,26 @@ sub create_idx {
 	close $FILE_IDX;
 	system("cp -v $builddir/pkg-$version-$isoconf->{iso}{tag}.idx $isodir/$isoname.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' \\
+        # 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 $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 \\
-	$builddir/../
-	";
+	-boot-info-table   \\
+        $builddir/../
+        ";
+	
 #-quiet \\
 	print_color("\n------------\n $cmd", $color);
 	system($cmd);
-- 
cgit v1.2.1