From owner-svn-src-user@FreeBSD.ORG  Wed Jan  5 01:07:32 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 B44D1106566C;
	Wed,  5 Jan 2011 01:07:32 +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 A380A8FC14;
	Wed,  5 Jan 2011 01:07:32 +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 p0517W0S060654;
	Wed, 5 Jan 2011 01:07:32 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0517WPf060652;
	Wed, 5 Jan 2011 01:07:32 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101050107.p0517WPf060652@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 5 Jan 2011 01:07:32 +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: r216985 - 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: Wed, 05 Jan 2011 01:07:32 -0000

Author: nwhitehorn
Date: Wed Jan  5 01:07:32 2011
New Revision: 216985
URL: http://svn.freebsd.org/changeset/base/216985

Log:
  Add a new variable (BSDINSTALL_CONFIGCURRENT), which, if set, will cause
  the installer to configure the current system in addition to the new one.
  This is for use by the network configuration script, which now does the
  appropriate thing in this case.

Modified:
  user/nwhitehorn/bsdinstall/scripts/netconfig

Modified: user/nwhitehorn/bsdinstall/scripts/netconfig
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/netconfig	Wed Jan  5 00:19:40 2011	(r216984)
+++ user/nwhitehorn/bsdinstall/scripts/netconfig	Wed Jan  5 01:07:32 2011	(r216985)
@@ -26,6 +26,15 @@ exec 3>&-
 cdialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' --yesno 'Would you like to use DHCP to configure this interface?' 0 0
 if [ $? -eq $DIALOG_OK ]; then
 	echo ifconfig_$INTERFACE=\"DHCP\" >> /tmp/rc.conf
+
+	if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
+		cdialog --backtitle 'FreeBSD Installer' --infobox "Acquiring DHCP lease..." 0 0
+		dhclient $INTERFACE 2>> $BSDINSTALL_LOG
+		if [ $? -ne 0 ]; then
+			cdialog --backtitle 'FreeBSD Installer' --msgbox "DHCP lease acquisition failed." 0 0
+			exec $0
+		fi
+	fi
 	exit 0
 fi
 
@@ -51,6 +60,14 @@ echo $INTERFACE $IF_CONFIG | 
 	printf("defaultrouter=\"%s\"\n", $4);
     }' >> /tmp/rc.conf
 
+if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
+	. /tmp/rc.conf
+	ifconfig $INTERFACE `eval echo \\\$ifconfig_$INTERFACE`
+	route delete default
+	route add default $defaultrouter
+fi
+
+
 echo $IF_CONFIG | 
     awk '{
 	if ($4 != "")
@@ -59,3 +76,6 @@ echo $IF_CONFIG | 
 		printf("search %s\n", $5);
     }' > /tmp/resolv.conf
 
+if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
+	cp /tmp/resolv.conf /etc/resolv.conf
+fi