From b23ae3bbd77d4a912c1584c4ae5dd0ed53993164 Mon Sep 17 00:00:00 2001
From: Anne Nicolas <ennael@mageia.org>
Date: Wed, 18 Jun 2014 22:42:33 +0200
Subject: Mageia 4 version for scripts for isos creation

---
 create_dual.sh |  4 ++--
 create_dvd.sh  | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/create_dual.sh b/create_dual.sh
index 849fa11..c8bfd6a 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -3,7 +3,7 @@
 DISTRIB=Mageia
 TREE=cauldron
 TAG=vanda
-VERSION=4-beta2
+VERSION=4
 SUPPORT=dual-DVD
 VV=1
 MEDIAMAIN=media/core
@@ -13,7 +13,7 @@ BUILDPATH="$HOME/build_bcd/build/$DISTRIB-$VERSION-$SUPPORT"
 BUILDISOPATH="$HOME/build_bcd/iso/$DISTRIB-$VERSION-$SUPPORT"
 
 # genisoimage options
-AGENISO="$DISTRIB - 4 beta 2"
+AGENISO="$DISTRIB - 4"
 PUBLISHER="Mageia.Org"
 SYSID="$PUBLISHER"
 TOOL="$SYSID BCD"
diff --git a/create_dvd.sh b/create_dvd.sh
index adbde84..fe59961 100755
--- a/create_dvd.sh
+++ b/create_dvd.sh
@@ -2,7 +2,7 @@
 
 arch=$1
 distrib=Mageia
-version=4-beta2
+version=4
 homebcd=/home/bcd/build_bcd
 bin=$homebcd/bcd
 pieces=$homebcd/pieces/iso
@@ -17,5 +17,13 @@ cp -r $pieces/images/$arch $build/isolinux
 
 rm -f $build/$arch/install/images/*nonfree*
 
+if [ "$arch" = "x86_64" ]
+then	
+	cd $build
+	tar -xvJf $pieces/DVD-efi.tar.xz
+	cd -
+	rm -f $homebcd/build/$distrib-$version-$arch/$arch/install/images/boot.iso
+fi
+
 $bin/bcd.pl dvd_free-$arch.xml iso
 date > $homebcd/iso/$distrib-$version-$arch/DATE.txt
-- 
cgit v1.2.1