Although I was going to try to avoid it, it turns out that it is

impossble to have merely "server.conf" and "client.conf" control
everything on a head node.  Some pieces must be refactored into
"common.conf".

9 files changed, 9 insertions, 0 deletions

diff --git a/Tools/portbuild/scripts/buildfailure b/Tools/portbuild/scripts/buildfailure
index 50e295a7cacf..e5d95d294c8d 100755
--- a/Tools/portbuild/scripts/buildfailure
+++ b/Tools/portbuild/scripts/buildfailure
@@ -29,6 +29,7 @@ shift 4
 builddir=${pb}/${arch}/${branch}/builds/${buildid}
 
 . ${pb}/conf/server.conf
+. ${pb}/conf/common.conf
 . ${pb}/${arch}/portbuild.conf
 . ${pb}/scripts/buildenv
 
diff --git a/Tools/portbuild/scripts/buildsuccess b/Tools/portbuild/scripts/buildsuccess
index ba4b8821b084..53a84e7a4030 100755
--- a/Tools/portbuild/scripts/buildsuccess
+++ b/Tools/portbuild/scripts/buildsuccess
@@ -23,6 +23,7 @@ shift 4
 builddir=${pb}/${arch}/${branch}/builds/${buildid}
 
 . ${pb}/conf/server.conf
+. ${pb}/conf/common.conf
 . ${pb}/${arch}/portbuild.conf
 . ${pb}/scripts/buildenv
 
diff --git a/Tools/portbuild/scripts/claim-chroot b/Tools/portbuild/scripts/claim-chroot
index faab2ae11f4b..349db63f4193 100755
--- a/Tools/portbuild/scripts/claim-chroot
+++ b/Tools/portbuild/scripts/claim-chroot
@@ -65,6 +65,7 @@ if [ ! -f ${builddir}/.ready ]; then
 fi
 
 . ${pb}/${arch}/client.conf
+. ${pb}/${arch}/common.conf
 . ${pb}/${arch}/portbuild.conf
 . ${pb}/${arch}/portbuild.$(hostname)
 
diff --git a/Tools/portbuild/scripts/clean-chroot b/Tools/portbuild/scripts/clean-chroot
index aeab24219d36..0ddad14928bc 100755
--- a/Tools/portbuild/scripts/clean-chroot
+++ b/Tools/portbuild/scripts/clean-chroot
@@ -45,6 +45,7 @@ clean=$5
 pb=/var/portbuild
 
 . ${pb}/${arch}/client.conf
+. ${pb}/${arch}/common.conf
 . ${pb}/${arch}/portbuild.conf
 . ${pb}/${arch}/portbuild.$(hostname)
 
diff --git a/Tools/portbuild/scripts/makeduds b/Tools/portbuild/scripts/makeduds
index bca438e14791..07bd7c98beab 100755
--- a/Tools/portbuild/scripts/makeduds
+++ b/Tools/portbuild/scripts/makeduds
@@ -19,6 +19,7 @@ shift 3
 builddir=${pb}/${arch}/${branch}/builds/${buildid}
 
 . ${pb}/conf/server.conf
+. ${pb}/conf/common.conf
 . ${pb}/${arch}/portbuild.conf
 . ${pb}/scripts/buildenv
 
diff --git a/Tools/portbuild/scripts/makeindex b/Tools/portbuild/scripts/makeindex
index 85f96bcac637..2425d07d55f3 100755
--- a/Tools/portbuild/scripts/makeindex
+++ b/Tools/portbuild/scripts/makeindex
@@ -32,6 +32,7 @@ shift 3
 builddir=${pb}/${arch}/${branch}/builds/${buildid}
 
 . ${pb}/conf/server.conf
+. ${pb}/conf/common.conf
 . ${pb}/${arch}/portbuild.conf
 . ${pb}/scripts/buildenv
 
diff --git a/Tools/portbuild/scripts/makerestr b/Tools/portbuild/scripts/makerestr
index 39d7f7203e88..74040776374c 100755
--- a/Tools/portbuild/scripts/makerestr
+++ b/Tools/portbuild/scripts/makerestr
@@ -16,6 +16,7 @@ buildid=$3
 shift
 
 . ${pb}/conf/server.conf
+. ${pb}/conf/common.conf
 . ${pb}/${arch}/portbuild.conf
 . ${pb}/scripts/buildenv
 
diff --git a/Tools/portbuild/scripts/pdispatch b/Tools/portbuild/scripts/pdispatch
index 4f1a134a9850..d79bd2c60c66 100755
--- a/Tools/portbuild/scripts/pdispatch
+++ b/Tools/portbuild/scripts/pdispatch
@@ -18,6 +18,7 @@ shift 5
 pbab=${pb}/${arch}/${branch}
 
 . ${pb}/conf/server.conf
+. ${pb}/conf/common.conf
 . ${pb}/${arch}/portbuild.conf
 . ${pb}/scripts/buildenv
 
diff --git a/Tools/portbuild/scripts/prunefailure b/Tools/portbuild/scripts/prunefailure
index a7a0e680f7e8..e8bc09e8878a 100755
--- a/Tools/portbuild/scripts/prunefailure
+++ b/Tools/portbuild/scripts/prunefailure
@@ -29,6 +29,7 @@ buildid=$3
 shift 3
 
 . ${pb}/conf/server.conf
+. ${pb}/conf/common.conf
 . ${pb}/${arch}/portbuild.conf
 . ${pb}/scripts/buildenv