svn commit: r246013 - head/usr.sbin/bsdinstall/scripts

[Nathan Whitehorn]

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