aboutsummaryrefslogtreecommitdiff
path: root/Tools/portbuild
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2005-10-11 03:55:27 +0000
committerKris Kennaway <kris@FreeBSD.org>2005-10-11 03:55:27 +0000
commit94cda32b840b06b5fea25af0714d5f2b1b625cd9 (patch)
tree879ae61de38332f4a72ded43dba33af74778e890 /Tools/portbuild
parentac6980959a05971f10fe2ce652b7d6e9c86c9d59 (diff)
downloadports-94cda32b840b06b5fea25af0714d5f2b1b625cd9.tar.gz
ports-94cda32b840b06b5fea25af0714d5f2b1b625cd9.zip
Notes
Diffstat (limited to 'Tools/portbuild')
-rwxr-xr-xTools/portbuild/scripts/dosetupnode12
1 files changed, 9 insertions, 3 deletions
diff --git a/Tools/portbuild/scripts/dosetupnode b/Tools/portbuild/scripts/dosetupnode
index dc06b4b48e1f..c32f569e70b2 100755
--- a/Tools/portbuild/scripts/dosetupnode
+++ b/Tools/portbuild/scripts/dosetupnode
@@ -22,10 +22,16 @@ echo "setting up of $node started at $(date)"
disconnected=0
. ${pb}/${arch}/portbuild.${node}
-md5=$(/sbin/md5 ${pb}/${arch}/${branch}/tarballs/bindist.tar | awk '{print $4}')
+if [ "${norsync}" = 1 ]; then
+ md5=0
+ nocopy=-nocopy
+else
+ md5=$(/sbin/md5 ${pb}/${arch}/${branch}/tarballs/bindist.tar | awk '{print $4}')
+ nocopy=
+fi
scp -p ${pb}/scripts/setupnode ${client_user}@${node}:/tmp
-ssh -n ${client_user}@${node} ${sudo_cmd} sh /tmp/setupnode $(hostname) ${pb} ${arch} ${branch} ${scratchdir} ${md5} ${disconnected}
+ssh -n ${client_user}@${node} ${sudo_cmd} sh /tmp/setupnode ${nocopy} $(hostname) ${pb} ${arch} ${branch} ${scratchdir} ${md5} ${disconnected}
if [ ! -z "${sudo_cmd}" -a ${disconnected} = "1" ]; then
ssh -n ${client_user}@${node} ${sudo_cmd} "chown -R ${client_user} /var/portbuild/"
fi
@@ -39,5 +45,5 @@ if [ "${disconnected}" = 1 -a "${norsync}" = 0 ]; then
rsync ${rsync_gzip} -r -L -p --delete ${pb}/${arch}/${branch}/tarballs/ ${client_user}@${node}:${pb}/${arch}/${branch}/tarballs/
fi
-lockf ${pb}/${arch}/queue/.lock ${pb}/scripts/pollmachine ${arch} ${node} -queue
+lockf -k ${pb}/${arch}/queue/.lock ${pb}/scripts/pollmachine ${arch} ${node} -queue
echo "setting up of $node ended at $(date)"