--- builds_bin/build_installer	2007/11/07 17:19:07	1.10
+++ builds_bin/build_installer	2008/07/08 13:58:19	1.15
@@ -1,10 +1,13 @@
 #!/bin/sh
 
 distname='SME Server'
-distvers=$(basename $(pwd))
+distvers=$(basename $(readlink -f $(pwd)))
 distrel=${distvers:0:1}
 distarch=$(uname -i)
 
+exec < /dev/null
+exec &> build_installer.$distarch
+
 if ! [ -d $distarch ]
 then
     echo "No $distarch directory?"
@@ -21,7 +24,7 @@ then
     PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/pkgorder \
 	--product SME \
 	$(pwd)/$distarch \
-	$distarch > pkgorder
+	$distarch > pkgorder.$distarch
 
     for PKG in /releases/$distrel/smeextras/$distarch/RPMS/*.rpm
     do
@@ -37,7 +40,7 @@ then
 	--version "$distrel.0" \
 	--release "$distname" \
 	--prodpath SME \
-	--pkgorder pkgorder \
+	--pkgorder pkgorder.$distarch \
 	$(pwd)/$distarch/
 
     sed -i 's@1,2,3@1@' $(pwd)/$distarch/.discinfo
@@ -51,6 +54,11 @@ 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
+
     PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \
 	--product "$distname" \
 	--version "$distrel.0" \
@@ -58,6 +66,8 @@ else
 	--prodpath SME \
 	--bugurl http://bugs.contribs.org/ \
 	$(pwd)/$distarch/
+
+    sudo rm upd-instroot
 fi
 
 # Remove previous linked files
@@ -66,8 +76,8 @@ find $(pwd)/$distarch/SME/ -type l | xar
 # Copy updated isolinux files
 sudo cp -f /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 9000 -o -not -group 9000 -\) -print0 | xargs -r0 chown 9000:9000
+find $(pwd)/$distarch -\( -type f -not -perm -0664 -o -type d -not -perm -0775 -\) -print0 | xargs -r0 chmod u+rwX,g+rwX,o+rX,o-w
 
 echo "You now need to run /stage/bin/build_ISO as non-root"