--- builds_bin/build_installer	2009/06/02 18:09:51	1.18
+++ builds_bin/build_installer	2011/12/16 16:48:38	1.23
@@ -39,7 +39,7 @@ then
 
     PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \
 	--product "$distname" \
-	--version "$distrel.0" \
+	--version "${distvers/[^0-9.]*/}" \
 	--release "$distname" \
 	--prodpath SME \
 	--pkgorder pkgorder.$distarch \
@@ -56,20 +56,24 @@ else
 	fi
     done
 
-    sed "/installforallkernels/ised -i 's|\\\\(enabled\\\\) = 1|\\\\1 = 0|' \$DEST/etc/yum/pluginconf.d/kmod.conf" \
-        /usr/lib/anaconda-runtime/upd-instroot > upd-instroot
-    chmod 755 upd-instroot
-    sudo chown root:root upd-instroot
+    cp /usr/lib/anaconda-runtime/mk-images* .
+    sed -i -e 's/count=12/count=15/' mk-images.*
+    sed -e "/installforallkernels/ised -i 's|\\\\(enabled\\\\) = 1|\\\\1 = 0|' \$DEST/etc/yum/pluginconf.d/kmod.conf" \
+        -e 's|^usr/\(.*/libz.*\)|&\n\1|' /usr/lib/anaconda-runtime/upd-instroot > upd-instroot
+    chmod 644 mk-images.*
+    chmod 755 mk-images upd-instroot
+    sudo chown root:root mk-images* upd-instroot
 
     PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \
 	--product "$distname" \
-	--version "$distrel.0" \
+	--version "${distvers/[^0-9.]*/}" \
 	--release "$distname" \
 	--prodpath SME \
 	--bugurl http://bugs.contribs.org/ \
 	$(pwd)/$distarch/
+    sed -i 's/ALL/1/' $distarch/.discinfo
 
-    sudo rm upd-instroot
+    sudo rm -rf $distarch/buildinstall.tree.*/ mk-images* upd-instroot
 fi
 
 # Remove previous linked files