Support ${client_user} and ${sudo_cmd} for running commands as root on

machines where we first connect to a non-root user and then increase
privileges.

Approved by:	portmgr (self)

1 files changed, 5 insertions, 1 deletions

diff --git a/Tools/portbuild/scripts/allgohans b/Tools/portbuild/scripts/allgohans
index 391a8a60bc12..2caa379809a6 100755
--- a/Tools/portbuild/scripts/allgohans
+++ b/Tools/portbuild/scripts/allgohans
@@ -14,10 +14,14 @@ doarch() {
     machines=$(awk '{print $1}' ${pb}/${arch}/mlist)
     
     for i in ${machines}; do
+	. ${pb}/${arch}/portbuild.conf
+	if [ -f "${pb}/${arch}/portbuild.${i}" ]; then
+	    . ${pb}/${arch}/portbuild.${i}
+	fi
 	if [ ${quiet} -eq 0 ]; then
 	    echo "[$i]"
 	fi
-	su ports-${arch} -c "ssh root@$i $@"
+	su ports-${arch} -c "ssh ${client_user}@$i ${sudo_cmd} $@"
     done
 }