From 838c550b3bcfea88bd352b481e74e3df0d61a4d1 Mon Sep 17 00:00:00 2001
From: Anne Nicolas <ennael@mageia.org>
Date: Sun, 21 Feb 2016 18:41:55 +0100
Subject: simplify script to generate iso and use official mirror as much as
 possible

---
 create_dvd.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/create_dvd.sh b/create_dvd.sh
index 3caf965..8090108 100755
--- a/create_dvd.sh
+++ b/create_dvd.sh
@@ -2,7 +2,7 @@
 
 arch=$1
 distrib=Mageia
-version=5
+version=6-dev1
 homebcd=/home/bcd/build_bcd
 bin=$homebcd/bcd
 pieces=$homebcd/pieces/iso
@@ -10,11 +10,14 @@ build=$homebcd/build/$distrib-$version-$arch
 
 $bin/bcd.pl dvd_free-$arch.xml all noiso
 
-rm -rf $build/$arch/isolinux
-cp -r $pieces/dvd/isolinux $build
+#rm -rf $build/$arch/isolinux
+#cp -r $pieces/dvd/isolinux $build
+mv $homebcd/build/$distrib-$version-$arch/$arch/isolinux $homebcd/build/$distrib-$version-$arch
 cp $pieces/dvd/$arch.cfg $build/isolinux/isolinux.cfg
-cp -r $pieces/images/$arch $build/isolinux
-cp -f $pieces/dvd/compssUsers.pl $homebcd/build/$distrib-$version-$arch/$arch/media/media_info
+cp $pieces/dvd/tools.cfg $build/isolinux/
+rm -f $build/isolinux/i386.cfg
+#cp -f /home/bcd/message $build/isolinux/bootlogo
+#cp -r $pieces/images/$arch $build/isolinux
 
 rm -f $build/$arch/install/images/*nonfree*
 
@@ -23,7 +26,6 @@ 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
-- 
cgit v1.2.1