From owner-svn-src-user@FreeBSD.ORG  Sat Jan  8 01:39:43 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 68DFD1065698;
	Sat,  8 Jan 2011 01:39:43 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 581A48FC0C;
	Sat,  8 Jan 2011 01:39:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p081dhv2072396;
	Sat, 8 Jan 2011 01:39:43 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p081dhtX072394;
	Sat, 8 Jan 2011 01:39:43 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101080139.p081dhtX072394@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 8 Jan 2011 01:39:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217139 - user/nwhitehorn/bsdinstall/scripts
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Jan 2011 01:39:43 -0000

Author: nwhitehorn
Date: Sat Jan  8 01:39:43 2011
New Revision: 217139
URL: http://svn.freebsd.org/changeset/base/217139

Log:
  Most users want network access. Although them to configure it from the
  installer even if this is not a network install.

Modified:
  user/nwhitehorn/bsdinstall/scripts/auto

Modified: user/nwhitehorn/bsdinstall/scripts/auto
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/auto	Sat Jan  8 01:15:32 2011	(r217138)
+++ user/nwhitehorn/bsdinstall/scripts/auto	Sat Jan  8 01:39:43 2011	(r217139)
@@ -29,6 +29,7 @@ done
 if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
 	cdialog --backtitle "FreeBSD Installer" --title "Network Installation" --msgbox "No installation files were found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0
 	bsdinstall netconfig || error
+	NETCONFIG_DONE=yes
 fi
 
 rm $PATH_FSTAB
@@ -44,6 +45,9 @@ fi
 
 bsdinstall distextract || error
 bsdinstall rootpass || error
+if [ "$NETCONFIG_DONE" != yes ]; then
+	bsdinstall netconfig	# Don't check for errors -- the user may cancel
+fi
 bsdinstall time || error
 bsdinstall services || error
 bsdinstall adduser || error