svn commit: r217139 - user/nwhitehorn/bsdinstall/scripts

[Nathan Whitehorn]

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