From 669da1d79600a05be1649c2459e1ce830fa7b882 Mon Sep 17 00:00:00 2001
From: Anne Nicolas <ennael@mageia.org>
Date: Mon, 15 Oct 2012 07:05:25 +0000
Subject: DVD and dual build script

---
 create_dual.sh | 13 +++++++++----
 create_dvd.sh  |  4 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/create_dual.sh b/create_dual.sh
index 60012e2..858dda4 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 DISTRIB=Mageia
-TAG=manon
-VERSION=2
+TAG=vanda
+VERSION=3-alpha2
 SUPPORT=dual-CD
 VV=1
 MEDIAMAIN=media/core
@@ -12,7 +12,7 @@ BUILDPATH="$HOME/build_bcd/build/$DISTRIB-$VERSION-$SUPPORT"
 BUILDISOPATH="$HOME/build_bcd/iso/$DISTRIB-$VERSION-$SUPPORT"
 
 # genisoimage options
-AGENISO="$DISTRIB - 2 rc"
+AGENISO="$DISTRIB - 2 alpha 1"
 PUBLISHER="Mageia.Org"
 SYSID="$PUBLISHER"
 TOOL="$SYSID BCD"
@@ -64,6 +64,11 @@ do
 	cat $OLDBUILDPATH-$i/$i/pkg-$VERSION-$TAG.idx >> $BUILDPATH/$DISTRIB-$VERSION-$SUPPORT.idx
 done
 
+# rename isolinux strings
+mv $BUILDPATH/isolinux $BUILDPATH/syslinux
+mv $BUILDPATH/syslinux/isolinux.cfg $BUILDPATH/syslinux/syslinux.cfg
+mv $BUILDPATH/syslinux/isolinux.bin $BUILDPATH/syslinux/syslinux.bin
+
 # build iso
 genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4  \
 	-A "$AGENISO" \
@@ -73,7 +78,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 isolinux/isolinux.bin \
+	-b syslinux/syslinux.bin \
 	-boot-info-table \
 	-quiet \
 	$BUILDPATH/
diff --git a/create_dvd.sh b/create_dvd.sh
index 6202e42..b797bde 100755
--- a/create_dvd.sh
+++ b/create_dvd.sh
@@ -2,7 +2,7 @@
 
 arch=$1
 distrib=Mageia
-version=2
+version=3-alpha2
 homebcd=/home/bcd/build_bcd
 bin=$homebcd/bcd
 pieces=$homebcd/pieces/iso
@@ -12,7 +12,9 @@ $bin/bcd.pl dvd_free-$arch.xml all noiso
 
 cp -af $pieces/hdt.c32 $build/$arch/isolinux
 cp -af $pieces/message $build/$arch/isolinux/bootlogo
+cp -af $homebcd/pieces/$version/$arch/isolinux/isolinux-$arch.bin $build/$arch/isolinux
 
 rm -f $build/$arch/install/images/*nonfree*
 
 $bin/bcd.pl dvd_free-$arch.xml iso
+date > $homebcd/iso/$distrib-$version-$arch/DATE.txt
-- 
cgit v1.2.1