From owner-svn-src-stable@FreeBSD.ORG  Sun Mar  3 08:17:18 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 09F4F499;
 Sun,  3 Mar 2013 08:17:18 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E4348A30;
 Sun,  3 Mar 2013 08:17:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r238HHHK049850;
 Sun, 3 Mar 2013 08:17:17 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r238HH9o049848;
 Sun, 3 Mar 2013 08:17:17 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201303030817.r238HH9o049848@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sun, 3 Mar 2013 08:17:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r247692 - stable/8/usr.sbin/sysinstall
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Mar 2013 08:17:18 -0000

Author: dteske
Date: Sun Mar  3 08:17:17 2013
New Revision: 247692
URL: http://svnweb.freebsd.org/changeset/base/247692

Log:
  MFS 9->8 r215224:
  We still support PLIP devices, so mention them in addition to ethernet.

Modified:
  stable/8/usr.sbin/sysinstall/install.c
  stable/8/usr.sbin/sysinstall/menus.c

Modified: stable/8/usr.sbin/sysinstall/install.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/install.c	Sun Mar  3 08:04:11 2013	(r247691)
+++ stable/8/usr.sbin/sysinstall/install.c	Sun Mar  3 08:17:17 2013	(r247692)
@@ -690,7 +690,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: stable/8/usr.sbin/sysinstall/menus.c
==============================================================================
--- stable/8/usr.sbin/sysinstall/menus.c	Sun Mar  3 08:04:11 2013	(r247691)
+++ stable/8/usr.sbin/sysinstall/menus.c	Sun Mar  3 08:17:17 2013	(r247692)
@@ -884,7 +884,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",