From owner-svn-src-all@FreeBSD.ORG  Fri Jun 18 21:10:56 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9C9021065670;
	Fri, 18 Jun 2010 21:10:56 +0000 (UTC)
	(envelope-from randi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8BDA08FC17;
	Fri, 18 Jun 2010 21:10:56 +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 o5ILAuF8072916;
	Fri, 18 Jun 2010 21:10:56 GMT (envelope-from randi@svn.freebsd.org)
Received: (from randi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5ILAuFw072914;
	Fri, 18 Jun 2010 21:10:56 GMT (envelope-from randi@svn.freebsd.org)
Message-Id: <201006182110.o5ILAuFw072914@svn.freebsd.org>
From: Randi Harper <randi@FreeBSD.org>
Date: Fri, 18 Jun 2010 21:10:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209315 - releng/8.1/usr.sbin/sysinstall
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 18 Jun 2010 21:10:56 -0000

Author: randi
Date: Fri Jun 18 21:10:56 2010
New Revision: 209315
URL: http://svn.freebsd.org/changeset/base/209315

Log:
  MFC r209273:
    Fix uninitialized variables that cause a crash when the network is
    initialized and sysinstall is not running as init.
  
  Submitted by:	Nick Mills
  Approved by:	cperciva (mentor)
  Approved by:	re (kensmith)

Modified:
  releng/8.1/usr.sbin/sysinstall/tcpip.c
Directory Properties:
  releng/8.1/usr.sbin/sysinstall/   (props changed)

Modified: releng/8.1/usr.sbin/sysinstall/tcpip.c
==============================================================================
--- releng/8.1/usr.sbin/sysinstall/tcpip.c	Fri Jun 18 20:07:30 2010	(r209314)
+++ releng/8.1/usr.sbin/sysinstall/tcpip.c	Fri Jun 18 21:10:56 2010	(r209315)
@@ -732,6 +732,9 @@ tcpDeviceSelect(void)
 	return (NULL);
     }
 
+    devs = deviceFind(NULL, DEVICE_TYPE_NETWORK);
+    cnt = deviceCount(devs); 
+
     if ((!RunningAsInit) && (variable_check("NETWORK_CONFIGURED=NO") != TRUE)) {
 	if (!msgYesNo("Running multi-user, assume that the network is already configured?"))
 	    return devs[0];