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".
This commit is contained in:
Mark Linimon 2010-12-01 02:27:35 +00:00
parent 03f4604fe0
commit 08037129f0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=265485
9 changed files with 9 additions and 0 deletions

View file

@ -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

View file

@ -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

View file

@ -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)

View file

@ -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)

View file

@ -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

View file

@ -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

View file

@ -16,6 +16,7 @@ buildid=$3
shift
. ${pb}/conf/server.conf
. ${pb}/conf/common.conf
. ${pb}/${arch}/portbuild.conf
. ${pb}/scripts/buildenv

View file

@ -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

View file

@ -29,6 +29,7 @@ buildid=$3
shift 3
. ${pb}/conf/server.conf
. ${pb}/conf/common.conf
. ${pb}/${arch}/portbuild.conf
. ${pb}/scripts/buildenv