From 3b6c61b0067aafdaefe763f70037513f97e5b4e2 Mon Sep 17 00:00:00 2001
From: Anne Nicolas <ennael@mageia.org>
Date: Sun, 24 Nov 2013 22:11:37 +0100
Subject: Mageia 4 beta 1

---
 create_dual.sh | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'create_dual.sh')

diff --git a/create_dual.sh b/create_dual.sh
index b8fa8c6..1868e99 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 DISTRIB=Mageia
-TREE=3
+TREE=cauldron
 TAG=vanda
-VERSION=3
-SUPPORT=dual-CD
+VERSION=4-beta1
+SUPPORT=dual-DVD
 VV=1
 MEDIAMAIN=media/core
 PIECES="$HOME/build_bcd/pieces"
@@ -13,7 +13,7 @@ BUILDPATH="$HOME/build_bcd/build/$DISTRIB-$VERSION-$SUPPORT"
 BUILDISOPATH="$HOME/build_bcd/iso/$DISTRIB-$VERSION-$SUPPORT"
 
 # genisoimage options
-AGENISO="$DISTRIB - 3 RC"
+AGENISO="$DISTRIB - 4 beta 1"
 PUBLISHER="Mageia.Org"
 SYSID="$PUBLISHER"
 TOOL="$SYSID BCD"
@@ -38,10 +38,17 @@ do
 	cp -af $OLDBUILDPATH-$i/$i $BUILDPATH
 	rm -rf $BUILDPATH/$i/install/images
 	rm -rf $BUILDPATH/$i/isolinux
-	cp -f $PIECES/iso/dual/compssUsers.pl $PIECES/iso/dual/rpmsrate $BUILDPATH/$i/media/media_info
+	cp -f $PIECES/iso/dual/compssUsers.pl $BUILDPATH/$i/media/media_info
 done
 sync
-cp -r $PIECES/iso/dual/syslinux $BUILDPATH
+
+cp -r $PIECES/iso/dual/isolinux $BUILDPATH
+
+for i in i586 x86_64
+do
+	cp -r $PIECES/iso/images/$i $BUILDPATH/isolinux/
+done
+
 
 for i in i586 x86_64
 do
@@ -81,7 +88,7 @@ genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-loa
 	-volset "$VOLSET" \
 	-V "$VOLUME" \
 	-o "$BUILDISOPATH/$DISTRIB-$VERSION-$SUPPORT.iso" \
-	-b syslinux/syslinux.bin \
+	-b isolinux/isolinux.bin \
 	-boot-info-table \
 	-quiet \
 	$BUILDPATH/
-- 
cgit v1.2.1