From owner-svn-src-all@FreeBSD.ORG  Wed Dec 25 13:57:23 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 94FB1A7D;
 Wed, 25 Dec 2013 13:57:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 817DB17E8;
 Wed, 25 Dec 2013 13:57:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBPDvNO8046644;
 Wed, 25 Dec 2013 13:57:23 GMT (envelope-from jmmv@svn.freebsd.org)
Received: (from jmmv@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBPDvNYU046643;
 Wed, 25 Dec 2013 13:57:23 GMT (envelope-from jmmv@svn.freebsd.org)
Message-Id: <201312251357.rBPDvNYU046643@svn.freebsd.org>
From: Julio Merino <jmmv@FreeBSD.org>
Date: Wed, 25 Dec 2013 13:57:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259868 - head/release
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Dec 2013 13:57:23 -0000

Author: jmmv
Date: Wed Dec 25 13:57:23 2013
New Revision: 259868
URL: http://svnweb.freebsd.org/changeset/base/259868

Log:
  Delay copying of resolv.conf into the chroot until /etc exists.
  
  With an unpopulated chroot dir, release building was failing because
  the script was attempting to copy resolv.conf into a non-existent /etc
  directory of the chroot.  Fix this by copying the file only after the
  installworld has happened, which will create this directory.
  
  Reviewed by:	gjb
  Approved by:	rpaulo (mentor)

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Wed Dec 25 13:51:14 2013	(r259867)
+++ head/release/release.sh	Wed Dec 25 13:57:23 2013	(r259868)
@@ -162,12 +162,12 @@ if [ "x${NOPORTS}" = "x" ]; then
 	svn co ${SVNROOT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports
 fi
 
-cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
 cd ${CHROOTDIR}/usr/src
 make ${CHROOT_WMAKEFLAGS} buildworld
 make ${CHROOT_IMAKEFLAGS} installworld DESTDIR=${CHROOTDIR}
 make ${CHROOT_DMAKEFLAGS} distribution DESTDIR=${CHROOTDIR}
 mount -t devfs devfs ${CHROOTDIR}/dev
+cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
 trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit
 
 build_doc_ports() {