1 files changed, 36 insertions, 33 deletions

diff --git a/create_dual.sh b/create_dual.sh
index 9797ed9..8d912b3 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -1,34 +1,37 @@
 #!/bin/sh
 
 TAG=farman
-VERSION=2010-spring
+VERSION=2010.2
 VV=2010.1
 
+BUILD_BCD=`pwd`/build_bcd/
+MIRROR=/mnt/BIG/official/2010.1/i586/
+
 ./bcd.pl dual.xml all copy noiso nodoble
 ./bcd.pl dual64.xml all copy noiso nodoble
 
-rm -vf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586/install/images/boot.iso
-rm -rvf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586/install/images/alternatives
-rm -vf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/install/images/boot.iso
-rm -vrf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/install/images/alternatives
+rm -vf $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-i586/i586/install/images/boot.iso
+rm -rvf $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-i586/i586/install/images/alternatives
+rm -vf $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/install/images/boot.iso
+rm -vrf $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/install/images/alternatives
 
 sync
 
-du -sh $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586
-du -sh $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64
+du -sh $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-i586/i586
+du -sh $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64
 
-rm -rf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION
-rm -rvf $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION
-mkdir -p $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION
-mkdir -p $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION
+rm -rf $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION
+rm -rvf $BUILD_BCD/iso/mandriva-linux-free-dual-$VERSION
+mkdir -p $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION
+mkdir -p $BUILD_BCD/iso/mandriva-linux-free-dual-$VERSION
 
-cp -af $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586 $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION
-cp -af $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64 $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION
+cp -af $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-i586/i586 $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION
+cp -af $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64 $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION
 
-cp -af /mnt/pieces/pieces/$VV/i586/dosutils $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/
-cp -af /mnt/pieces/pieces/$VV/i586/autorun.inf $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/
+cp -af $MIRROR/dosutils $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/
+cp -af $MIRROR/autorun.inf $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/
 
-cd $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/x86_64/media/main
+cd $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/x86_64/media/main
 
 for i in *noarch.rpm
 do
@@ -43,7 +46,7 @@ do
 	fi
 done
 
-cat >> $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/i586/isolinux/isolinux.cfg <<EOF
+cat >> $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/i586/isolinux/isolinux.cfg <<EOF
 label harddisk64
   localboot 0x80
 label linux64
@@ -77,31 +80,31 @@ label memtest64
   kernel memtest
 EOF
 
-#cp -avf $HOME/bcd/compssUsers.pl $HOME/build_bcd/build/mandriva-linux-free-dual-$TAG-$VERSION/i586/media/media_info/compssUsers.pl
-#cp -avf $HOME/bcd/compssUsers.pl $HOME/build_bcd/build/mandriva-linux-free-dual-$TAG-$VERSION/x86_64/media/media_info/compssUsers.pl
-cat $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-i586/i586/pkg-$VERSION-$TAG.idx >>  \
- $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx
-cat $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/pkg-$VERSION-$TAG.idx >>  \
- $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx
+#cp -avf $HOME/bcd/compssUsers.pl $BUILD_BCD/build/mandriva-linux-free-dual-$TAG-$VERSION/i586/media/media_info/compssUsers.pl
+#cp -avf $HOME/bcd/compssUsers.pl $BUILD_BCD/build/mandriva-linux-free-dual-$TAG-$VERSION/x86_64/media/media_info/compssUsers.pl
+cat $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-i586/i586/pkg-$VERSION-$TAG.idx >>  \
+ $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx
+cat $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION-x86_64/x86_64/pkg-$VERSION-$TAG.idx >>  \
+ $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx
 
 
 genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4  \
-	-A 'Mandriva Linux - 2010 Spring (Free)' \
+	-A 'Mandriva Linux - 2010.2 (Free)' \
 	-publisher 'Mandriva' \
 	-sysid 'Mandriva Linux' \
 	-p 'Mandriva-Linux BCD' \
-	-volset 'Mandriva Linux - 2010 Spring (Free) - DUAL CD' \
-	-V 'FREE-2010S-DUAL' \
-	-o '/home/plop/build_bcd/iso/mandriva-linux-free-dual-2010-spring/mandriva-linux-free-2010-spring-dual.iso' \
+	-volset 'Mandriva Linux - 2010.2 (Free) - DUAL CD' \
+	-V 'FREE-20102-DUAL' \
+	-o "$BUILD_BCD/iso/mandriva-linux-free-dual-2010.2/mandriva-linux-free-2010.2-dual.iso" \
 	-b i586/isolinux/isolinux.bin \
 	-boot-info-table \
 	-quiet \
-	$HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/
+	$BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/
 
-du -sh $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.iso
-echo "$HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx"
-cd $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION/
-isohybrid -fatfirst $HOME/build_bcd/iso/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.iso
-cp $HOME/build_bcd/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx .
+du -sh $BUILD_BCD/iso/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.iso
+echo "$BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx"
+cd $BUILD_BCD/iso/mandriva-linux-free-dual-$VERSION/
+isohybrid -fatfirst $BUILD_BCD/iso/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.iso
+cp $BUILD_BCD/build/mandriva-linux-free-dual-$VERSION/mandriva-linux-free-$VERSION-dual.idx .
 md5sum mandriva-linux-free-$VERSION-dual.iso > mandriva-linux-free-$VERSION-dual.iso.md5
 sha1sum mandriva-linux-free-$VERSION-dual.iso > mandriva-linux-free-$VERSION-dual.iso.sha1