--- builds_bin/build_installer	2008/07/07 15:35:28	1.14
+++ builds_bin/build_installer	2012/07/27 18:07:11	1.24
@@ -14,6 +14,8 @@ then
     exit 1
 fi
 
+rm -rf $(pwd)/$distarch/{images,isolinux} $(pwd)/$distarch/SME/base/{hdlist*,*.img}
+
 if [ "$distrel" == "7" ]
 then
     PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/genhdlist \
@@ -26,7 +28,7 @@ then
 	$(pwd)/$distarch \
 	$distarch > pkgorder.$distarch
 
-    for PKG in /releases/$distrel/smeextras/$distarch/RPMS/*.rpm
+    for PKG in /build/smeserver/repo/releases/$distrel/smeextras/$distarch/RPMS/*.rpm
     do
 	PKGFILE=$(basename $PKG)
 	if [ ! -f $(pwd)/$distarch/SME/RPMS/$PKGFILE ]
@@ -37,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 \
@@ -45,7 +47,7 @@ then
 
     sed -i 's@1,2,3@1@' $(pwd)/$distarch/.discinfo
 else
-    for PKG in /releases/testing/$distrel/smeextras/$distarch/RPMS/*.rpm
+    for PKG in /build/smeserver/repo/releases/testing/$distrel/smeextras/$distarch/RPMS/*.rpm
     do
 	PKGFILE=$(basename $PKG)
 	if [ ! -f $(pwd)/$distarch/SME/$PKGFILE ]
@@ -54,31 +56,35 @@ else
 	fi
     done
 
-    sed '/^cat .*pluginconf.d\/fedorakmod.conf.*<<.*EOF/,/^EOF$/s@^enabled.*@enabled = 0@' \
-        /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
 find $(pwd)/$distarch/SME/ -type l | xargs rm -f
 
 # Copy updated isolinux files
-sudo cp -f /stage/extra/isolinux/$distrel/* $(pwd)/$distarch/isolinux/
+sudo cp -f /build/smeserver/stage/extra/isolinux/$distrel/* $(pwd)/$distarch/isolinux/
 
-sudo chown -R 9000:9001 $(pwd)/$distarch/
-sudo chmod -R u+rwX,g+rwX,o+rX,o-w $(pwd)/$distarch/
+find $(pwd)/$distarch -\( -not -user 10020 -o -not -group 10020 -\) -print0 | sudo xargs -r0 chown 10020:10020
+find $(pwd)/$distarch -\( -type f -not -perm -0664 -o -type d -not -perm -0775 -\) -print0 | sudo xargs -r0 chmod u+rwX,g+rwX,o+rX,o-w
 
-echo "You now need to run /stage/bin/build_ISO as non-root"
+echo "You now need to run /build/smeserver/stage/bin/build_ISO as non-root"
 
 # That's it.