--- builds_bin/build_installer	2007/11/07 17:19:07	1.10
+++ builds_bin/build_installer	2008/07/07 15:35:28	1.14
@@ -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