From owner-svn-src-all@FreeBSD.ORG  Sun Jan 27 23:12:38 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 0F6D1475;
 Sun, 27 Jan 2013 23:12:38 +0000 (UTC)
 (envelope-from nwhitehorn@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 01C2FB56;
 Sun, 27 Jan 2013 23:12:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RNCbQ9025314;
 Sun, 27 Jan 2013 23:12:37 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RNCbdY025313;
 Sun, 27 Jan 2013 23:12:37 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201301272312.r0RNCbdY025313@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 27 Jan 2013 23:12:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246013 - head/usr.sbin/bsdinstall/scripts
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.14
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: Sun, 27 Jan 2013 23:12:38 -0000

Author: nwhitehorn
Date: Sun Jan 27 23:12:37 2013
New Revision: 246013
URL: http://svnweb.freebsd.org/changeset/base/246013

Log:
  If no resolv.conf has been made for the new system already and the install
  media has one already, copy it in lieu of leaving things blank. This
  reduces the foot-shooting potential for PXE installs that immediately
  add packages.

Modified:
  head/usr.sbin/bsdinstall/scripts/script

Modified: head/usr.sbin/bsdinstall/scripts/script
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/script	Sun Jan 27 23:08:55 2013	(r246012)
+++ head/usr.sbin/bsdinstall/scripts/script	Sun Jan 27 23:12:37 2013	(r246013)
@@ -68,6 +68,11 @@ bsdinstall distextract
 # Finalize install
 bsdinstall config
 
+# Make sure networking is functional, if we can arrange that
+if [ ! -f $BSDINSTALL_CHROOT/etc/resolv.conf -a -f /etc/resolv.conf ]; then
+	cp /etc/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf
+fi
+
 # Run post-install script
 if [ -f /tmp/bsdinstall-installscript-ab ]; then
 	cp /tmp/bsdinstall-installscript-ab $BSDINSTALL_CHROOT/tmp/installscript