From owner-svn-src-head@FreeBSD.ORG  Sat Nov 13 01:21:55 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CC9FB1065670;
	Sat, 13 Nov 2010 01:21:55 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BA06F8FC0A;
	Sat, 13 Nov 2010 01:21:55 +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 oAD1LtwS030528;
	Sat, 13 Nov 2010 01:21:55 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAD1Ltf7030525;
	Sat, 13 Nov 2010 01:21:55 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201011130121.oAD1Ltf7030525@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Sat, 13 Nov 2010 01:21:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215224 - head/usr.sbin/sysinstall
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Nov 2010 01:21:55 -0000

Author: brucec
Date: Sat Nov 13 01:21:55 2010
New Revision: 215224
URL: http://svn.freebsd.org/changeset/base/215224

Log:
  We still support PLIP devices, so mention them in addition to ethernet.

Modified:
  head/usr.sbin/sysinstall/install.c
  head/usr.sbin/sysinstall/menus.c

Modified: head/usr.sbin/sysinstall/install.c
==============================================================================
--- head/usr.sbin/sysinstall/install.c	Sat Nov 13 01:11:13 2010	(r215223)
+++ head/usr.sbin/sysinstall/install.c	Sat Nov 13 01:21:55 2010	(r215224)
@@ -692,7 +692,7 @@ nodisks:
 		   "may do so by typing: /usr/sbin/sysinstall.");
     }
     if (mediaDevice->type != DEVICE_TYPE_FTP && mediaDevice->type != DEVICE_TYPE_NFS) {
-	if (!msgYesNo("Would you like to configure any Ethernet network devices?")) {
+	if (!msgYesNo("Would you like to configure any Ethernet or PLIP network devices?")) {
 	    Device *tmp = tcpDeviceSelect();
 
 	    if (tmp && !((DevInfo *)tmp->private)->use_dhcp && !msgYesNo("Would you like to bring the %s interface up right now?", tmp->name))

Modified: head/usr.sbin/sysinstall/menus.c
==============================================================================
--- head/usr.sbin/sysinstall/menus.c	Sat Nov 13 01:11:13 2010	(r215223)
+++ head/usr.sbin/sysinstall/menus.c	Sat Nov 13 01:21:55 2010	(r215224)
@@ -882,7 +882,7 @@ DMenu MenuMediaFTP = {
 DMenu MenuNetworkDevice = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Network interface information required",
-    "Please select the ethernet device to configure.\n\n"
+    "Please select the ethernet or PLIP device to configure.\n\n"
     "",
     "Press F1 to read network configuration manual",
     "network_device",