3 files changed, 52 insertions, 64 deletions
diff --git a/create_dual.sh b/create_dual.sh
index fc56dc5..b742e12 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -1,42 +1,31 @@
 #!/bin/sh +xv
 
+TAGS=mes5
+NAMER="mandriva-linux-corporate-DUAL"
 
 ./bcd.pl dual.xml all copy noiso
 ./bcd.pl dual64.xml all copy noiso
 
-rm -vf $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-i586/i586/install/images/boot.iso
-rm -vf $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-x86_64/x86_64/install/images/boot.iso
-
-cp -vf $HOME/mymkcd-cs5/pieces/updates/64/all.rdz $HOME/mymkcd-cs5/pieces/updates/64/vmlinuz $HOME/build_bcd/build/MES5-dual-5.1-x86_64/x86_64/isolinux/alt0
-cp -vf $HOME/mymkcd-cs5/pieces/updates/64/bootlogo $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-x86_64/x86_64/isolinux
-cp -vf $HOME/mymkcd-cs5/pieces/updates/64/mdkinst.sqfs $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-x86_64/x86_64/install/stage2
-cp -vf $HOME/mymkcd-cs5/pieces/updates/64/compssUsers.pl.dual $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-x86_64/x86_64/media/media_info/compssUsers.pl
-cp -vf $HOME/mymkcd-cs5/pieces/updates/64/rpmsrate $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-x86_64/x86_64/media/media_info
-
-cp -vf $HOME/mymkcd-cs5/pieces/updates/32/all.rdz $HOME/mymkcd-cs5/pieces/updates/32/vmlinuz $HOME/build_bcd/build/MES5-dual-5.1-i586/i586/isolinux/alt0
-cp -vf $HOME/mymkcd-cs5/pieces/updates/32/bootlogo $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-i586/i586/isolinux
-cp -vf $HOME/mymkcd-cs5/pieces/updates/32/mdkinst.sqfs $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-i586/i586/install/stage2
-cp -vf $HOME/mymkcd-cs5/pieces/updates/32/compssUsers.pl.dual $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-i586/i586/media/media_info/compssUsers.pl
-cp -vf $HOME/mymkcd-cs5/pieces/updates/32/rpmsrate $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-i586/i586/media/media_info
-
-
+rm -vf $HOME/build_bcd/build/$NAMER-$TAGS-i586/i586/install/images/boot.iso
+rm -vf $HOME/build_bcd/build/$NAMER-$TAGS-x86_64/x86_64/install/images/boot.iso
+rm -vf $HOME/build_bcd/build/$NAMER-$TAGS-i586/i586/isolinux/alt1
+rm -vf $HOME/build_bcd/build/$NAMER-$TAGS-x86_64/x86_64/isolinux/alt1
+rm -vrf $HOME/build_bcd/build/$NAMER-$TAGS-i586/i586/install/images/alternatives
+rm -vrf $HOME/build_bcd/build/$NAMER-$TAGS-x86_64/x86_64/install/images/alternatives
 sync
 
-du -sh $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-i586/i586
-du -sh $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-x86_64/x86_64
+du -sh $HOME/build_bcd/build/$NAMER-$TAGS-i586/i586
+du -sh $HOME/build_bcd/build/$NAMER-$TAGS-x86_64/x86_64
 
-rm -rf $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1
-rm -rvf $HOME/mymkcd-cs5/build_bcd/iso/MES5-dual-5.1
-mkdir -p $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1
-mkdir -p $HOME/mymkcd-cs5/build_bcd/iso/MES5-dual-5.1
+rm -rf $HOME/build_bcd/build/$NAMER-$TAGS
+rm -rvf $HOME/build_bcd/iso/$NAMER-$TAGS
+mkdir -p $HOME/build_bcd/build/$NAMER-$TAGS
+mkdir -p $HOME/build_bcd/iso/$NAMER-$TAGS
 
-cp -af $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-i586/i586 $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1
-cp -af $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1-x86_64/x86_64 $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1
+cp -af $HOME/build_bcd/build/$NAMER-$TAGS-i586/i586 $HOME/build_bcd/build/$NAMER-$TAGS
+cp -af $HOME/build_bcd/build/$NAMER-$TAGS-x86_64/x86_64 $HOME/build_bcd/build/$NAMER-$TAGS
 
-cp -af /mnt/pieces/pieces/2010.0/i586/dosutils $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1
-cp -af /mnt/pieces/pieces/2010.0/i586/autorun.inf $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1
-
-cd $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1/x86_64/media/main
+cd $HOME/build_bcd/build/$NAMER-$TAGS/x86_64/media/main
 
 for i in *noarch.rpm
 do
@@ -51,11 +40,7 @@ do
 	fi
 done
 
-
-cp -avf $HOME/bcd/compssUsers.pl $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1/i586/media/media_info/compssUsers.pl
-cp -avf $HOME/bcd/compssUsers.pl $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1/x86_64/media/media_info/compssUsers.pl
-
-
+create_iso() {
 genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4  \
 	-A 'Mandriva Linux - MES5' \
 	-publisher 'Mandriva' \
@@ -63,14 +48,16 @@ genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-loa
 	-p 'Mandriva-Linux BCD' \
 	-volset 'Mandriva Linux - MES5 - DUAL CD' \
 	-V 'MES5-DUAL' \
-	-o '/home/installeur/mymkcd-cs5/build_bcd/iso/MES5-dual-5.1/MES5-dual-5.1.iso' \
+	-o '/home/builduser/build_bcd/iso/$NAMER-5.2/$NAMER.iso' \
 	-b i586/isolinux/isolinux.bin \
 	-boot-info-table \
-	$HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1/
+	$HOME/build_bcd/build/$NAMER-$TAGS/
 
-cd $HOME/mymkcd-cs5/build_bcd/iso/MES5-dual-5.1/
-md5sum MES5-dual-5.1.iso > MES5-dual-5.1.iso.md5
-sha1sum MES5-dual-5.1.iso > MES5-dual-5.1.iso.sha1
-cat $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1/i586/pkg-5.1-Official.idx > $HOME/mymkcd-cs5/build_bcd/iso/MES5-dual-5.1/MES5-dual-5.1.idx
-cat $HOME/mymkcd-cs5/build_bcd/build/MES5-dual-5.1/x86_64/pkg-5.1-Official.idx >> $HOME/mymkcd-cs5/build_bcd/iso/MES5-dual-5.1/MES5-dual-5.1.idx
+cd $HOME/build_bcd/iso/$NAMER-$TAGS/
+md5sum $NAMER-$TAGS.iso > $NAMER-$TAGS.iso.md5
+sha1sum $NAMER-$TAGS.iso > $NAMER-$TAGS.iso.sha1
+cat $HOME/build_bcd/build/$NAMER-$TAGS/i586/pkg-*.idx > $HOME/build_bcd/iso/$NAMER-$TAGS/$NAMER-$TAGS.idx
+cat $HOME/build_bcd/build/$NAMER-$TAGS/x86_64/pkg-*.idx >> $HOME/build_bcd/iso/$NAMER-$TAGS/$NAMER-$TAGS.idx
+}
 
+du -shL $HOME/build_bcd/build/$NAMER-$TAGS/
diff --git a/lists/basesystem_mini b/lists/basesystem_mini
index 4ba6d91..a49b989 100644
--- a/lists/basesystem_mini
+++ b/lists/basesystem_mini
@@ -18,7 +18,7 @@ iputils
 gnupg
 wireless-tools
 #ndiswrapper
-msec
+#msec
 wpa_supplicant
 
 mandriva-theme-Free
@@ -69,20 +69,20 @@ cpufreq
 apmd
 pcmciautils
 dmraid
-laptop-mode-tools
+#laptop-mode-tools
 numlock
 vlan-utils
 reiserfsprogs
 xfsprogs
 alsa-utils
-task-x11
-task-lxde
-lxtask
-lxpanel
-xarchiver
+#task-x11
+#task-lxde
+#lxtask
+#lxpanel
+#xarchiver
 #icewm
 pptp-linux
-ppp
+ppp-
 nfs-utils-clients
 nfs-utils
 ppp-pppoe
@@ -101,11 +101,11 @@ setserial
 x11-driver-input
 x11-driver-video
 x11-server-xvfb
-drakxtools
+#drakxtools
 drakx-kbd-mouse-x11
-drakx-net
+#drakx-net
 drakx-net-text
-drakconf
+#drakconf
 drakxtools-curses
 brltty
 jfsutils
@@ -118,30 +118,30 @@ ldetect
 udev
 sharutils
 sudo
-gdm
+gdm-
 x11-driver-input-vboxmouse
 x11-driver-video-vboxvideo
 x11-driver-video-sisimedia
-virtualbox-guest-additions
+#virtualbox-guest-additions
 #glibc-devel
 #ncurses-devel
 fonts-ttf-dejavu
 ia_ora-gnome
-metacity
+#metacity
 gnome-settings-daemon
-rpmdrake
+#rpmdrake
 lvm2
-drakfirsttime
+#drakfirsttime
 firefox
 ntfs-3g
 dkms-minimal
 #dkms
-xchat
+#xchat
 #gedit
 mdadm
-man
-xguest
-glxinfo
-msec-gui
-mdkonline
-task-pulseaudio
+#man
+#xguest
+#glxinfo
+#msec-gui
+#mdkonline
+#task-pulseaudio
diff --git a/lists/exclude_mini b/lists/exclude_mini
index 28d06d0..2dc8767 100644
--- a/lists/exclude_mini
+++ b/lists/exclude_mini
@@ -15,7 +15,7 @@ mandriva-lxde-config-Free
 mandriva-lxde-config-Mini
 policykit-kde
 polkit-kde-1
-kernel-source
+kernel-source-
 dkms-vboxadditions
 kernel-kerrighed
 kernel-linus
@@ -28,3 +28,4 @@ kernel-vserver
 rsbac-admin
 apache-mod_rsbac
 apache-mpm-rsbac
+task-printing