--- builds_bin/build_ISO	2013/02/13 19:36:25	1.37
+++ builds_bin/build_ISO	2014/05/09 16:40:03	1.41
@@ -65,7 +65,10 @@ then
     createrepo --update --database --groupfile repodata/comps.xml -u "media://$(head -1 $distarch/.discinfo)" $(pwd)/$distarch/
 elif [ "$distrel" == "9" ]
 then
-    createrepo --database --update --skip-symlinks --groupfile repodata/comps.xml $(pwd)/$distarch/
+    mkdir -p $(pwd)/$distarch/repodata/
+    rm -f  $(pwd)/$distarch/repodata/*comps.xml*
+    /bin/cp -af $(pwd)/$distarch/Packages/base/comps.xml $(pwd)/$distarch/repodata/
+    createrepo --database --update --skip-symlinks --simple-md-filenames --groupfile repodata/comps.xml $(pwd)/$distarch/
 fi
 sync; rm -rf $(pwd)/$distarch/.olddata $(pwd)/$distarch/repodata/repoview $(pwd)/$distarch/repoview
 repoview $(pwd)/$distarch/
@@ -84,11 +87,14 @@ mkisofs $mkisopts -V "$distname" \
     $(pwd)/$distarch/
 
 cp -a $(pwd)/$distarch/images/boot.iso ../iso/$distrel/$distarch/$disttag-$distvers-$distarch-netinstall.iso
-/usr/lib/anaconda-runtime/implantisomd5 ../iso/$distrel/$distarch/$disttag-$distvers-$distarch-netinstall.iso
-dd if=/dev/zero bs=2048 count=150 >> ../iso/$distrel/$distarch/$disttag-$distvers-$distarch-netinstall.iso
 
-/usr/lib/anaconda-runtime/implantisomd5 ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
-dd if=/dev/zero bs=2048 count=150 >> ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
+isohybrid ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
+if [ -x /usr/lib/anaconda-runtime/implantisomd5 ]
+then
+    /usr/lib/anaconda-runtime/implantisomd5 ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
+else
+    implantisomd5 ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
+fi
 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