--- builds_bin/build_ISO	2009/11/03 22:35:28	1.29
+++ builds_bin/build_ISO	2012/05/25 17:47:34	1.36
@@ -53,7 +53,7 @@ then
 	$(pwd)/$distarch/
 fi
 
-rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso ../iso/$distrel/$distarch/$disttag.iso
+rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso* ../iso/$distrel/$distarch/$disttag-$distarch.iso
 rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.jigdo ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.template
 
 if [ "$distrel" == "7" ]
@@ -76,7 +76,10 @@ mkisofs $mkisopts \
     -b "$bootimg" \
     -c "$bootcat" \
     -no-emul-boot -boot-load-size 4 -boot-info-table \
-    -x lost+found -x product -x updates -x 'buildinstall.tree.*' -x CVS \
+    -x lost+found -x 'buildinstall.tree.*' -x CVS \
+    -x $(pwd)/$distarch/images/boot.iso -x $(pwd)/$distarch/images/diskboot.img \
+    -x $(pwd)/$distarch/images/xen -x $(pwd)/$distarch/images/pxeboot \
+    -x $(pwd)/$distarch/product -x $(pwd)/$distarch/updates \
     -o ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso \
     $(pwd)/$distarch/
 
@@ -85,8 +88,8 @@ dd if=/dev/zero bs=2048 count=150 >> ../
 md5sum ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso | sed 's,\.\..*/,,' > ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.md5sum
 sha1sum ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso | sed 's,\.\..*/,,' > ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.sha1sum
 zsyncmake -u $disttag-$distvers-$distarch.iso -o ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.zsync ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
-mv ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso ../iso/$distrel/$distarch/$disttag.iso
-ln -sf $disttag.iso ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
+mv ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso ../iso/$distrel/$distarch/$disttag-$distarch.iso
+ln -sf $disttag-$distarch.iso ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
 
 rsync -a --delete --delete-excluded \
     --exclude 'repodata/' --exclude 'product/' --exclude 'updates/' --exclude 'repoview/' \
@@ -103,7 +106,7 @@ rm -rf $distarch.jigdo/
 
 if [ -d SRPMS -a "$distarch" == "i386" ]
 then
-    rm -f ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso ../iso/$distrel/source/$disttag-SRPMS.iso
+    rm -f ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso* ../iso/$distrel/source/$disttag-SRPMS.iso*
 
     mkisofs $mkisopts \
 	-V "$distname $distvers SRPMS" \