From owner-svn-src-projects@FreeBSD.ORG  Wed Jan  9 08:07:10 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 82416F54;
 Wed,  9 Jan 2013 08:07:10 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4E1D28F1;
 Wed,  9 Jan 2013 08:07:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0987AnK095846;
 Wed, 9 Jan 2013 08:07:10 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0987ATR095845;
 Wed, 9 Jan 2013 08:07:10 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201301090807.r0987ATR095845@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 9 Jan 2013 08:07:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245219 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jan 2013 08:07:10 -0000

Author: linimon (doc,ports committer)
Date: Wed Jan  9 08:07:09 2013
New Revision: 245219
URL: http://svnweb.freebsd.org/changeset/base/245219

Log:
  Start the deorbit burn of sudo_cmd.  In theory this is no longer necessary.
  
  While here, add a backstop to copy client.conf and common.conf to the slaves
  from the conf/ directory if they do not exist in builddir.  The latter was
  the way it was set up on pointyhat-west but it seems fragile to rely on it
  being so.

Modified:
  projects/portbuild/scripts/dosetupnode

Modified: projects/portbuild/scripts/dosetupnode
==============================================================================
--- projects/portbuild/scripts/dosetupnode	Wed Jan  9 05:49:52 2013	(r245218)
+++ projects/portbuild/scripts/dosetupnode	Wed Jan  9 08:07:09 2013	(r245219)
@@ -24,6 +24,9 @@ buildid=$3
 nodelist=$4
 shift 4
 
+# XXX MCL 20121216 in theory if the slaves become owner 'portbuild' you won't need this.
+sudo_cmd=
+
 . ${pbc}/conf/server.conf
 if [ -f ${pbd}/${arch}/portbuild.conf ]; then
     . ${pbd}/${arch}/portbuild.conf
@@ -86,8 +89,17 @@ setup() {
 	    ${client_user}@${node}:/var/portbuild/
 	checkerror $? || (echo "Copying scripts to ${node} failed"; return 1)
 
-	# conf files (e.g. client.conf and common.conf) can be symlinks outside
-	# this dir, so copy the actual files
+	# copy the default conf files (i.e., client.conf and common.conf) in case
+        # they are not overriden by per-buildenv ones, and have not been symlinked
+	rsync ${rsync_gzip} -e "${ssh_cmd}" -r -L -p --delete ${pbd}/conf/client.conf \
+	    ${client_user}@${node}:${pbd}/${arch}
+	checkerror $? || (echo "Copying client.conf to ${node} failed"; return 1)
+	rsync ${rsync_gzip} -e "${ssh_cmd}" -r -L -p --delete ${pbd}/conf/common.conf \
+	    ${client_user}@${node}:${pbd}/${arch}
+	checkerror $? || (echo "Copying common.conf to ${node} failed"; return 1)
+
+	# per-buildenv conf files (e.g., client.conf and common.conf) can be symlinks
+        # outside this dir, so copy the actual files
 	rsync ${rsync_gzip} -e "${ssh_cmd}" -r -L -p --delete ${pbd}/${arch}/*.conf \
 	    ${client_user}@${node}:${pbd}/${arch}
 	checkerror $? || (echo "Copying *.conf to ${node} failed"; return 1)