From owner-svn-src-head@FreeBSD.ORG Sun Aug 15 22:16:52 2010 Return-Path: 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 158B11065675; Sun, 15 Aug 2010 22:16:52 +0000 (UTC) (envelope-from marc@blackend.org) Received: from abigail.blackend.org (ns0.blackend.org [82.227.222.164]) by mx1.freebsd.org (Postfix) with ESMTP id 8593F8FC13; Sun, 15 Aug 2010 22:16:51 +0000 (UTC) Received: from gothic.blackend.org (gothic.blackend.org [192.168.1.203]) by abigail.blackend.org (8.13.4/8.13.3) with ESMTP id o7FM6Zh9040532; Mon, 16 Aug 2010 00:06:35 +0200 (CEST) (envelope-from marc@abigail.blackend.org) Received: from gothic.blackend.org (localhost [127.0.0.1]) by gothic.blackend.org (8.14.4/8.14.4) with ESMTP id o7FM6ZUF085951; Mon, 16 Aug 2010 00:06:35 +0200 (CEST) (envelope-from marc@gothic.blackend.org) Received: (from marc@localhost) by gothic.blackend.org (8.14.4/8.14.4/Submit) id o7FM6Ztu085950; Mon, 16 Aug 2010 00:06:35 +0200 (CEST) (envelope-from marc) Date: Mon, 16 Aug 2010 00:06:35 +0200 From: Marc Fonvieille To: Bruce Cran Message-ID: <20100815220635.GA79635@gothic.blackend.org> References: <201007162042.o6GKgKHJ016694@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201007162042.o6GKgKHJ016694@svn.freebsd.org> X-Useless-Header: blackend.org X-Operating-System: FreeBSD 8.1-RELEASE User-Agent: Mutt/1.5.20 (2009-06-14) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r210175 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Aug 2010 22:16:52 -0000 On Fri, Jul 16, 2010 at 08:42:20PM +0000, Bruce Cran wrote: > Author: brucec > Date: Fri Jul 16 20:42:20 2010 > New Revision: 210175 > URL: http://svn.freebsd.org/changeset/base/210175 > > Log: > FreeBSD 8 doesn't support kernel PPP or SLIP; remove code for configuring > and installing via such devices from sysinstall. > > Reviewed by: randi > Approved by: rrs (mentor) > MFC after: 1 month > > Modified: > head/usr.sbin/sysinstall/devices.c > head/usr.sbin/sysinstall/install.c > head/usr.sbin/sysinstall/menus.c > head/usr.sbin/sysinstall/network.c > [...] > > Modified: head/usr.sbin/sysinstall/install.c > ============================================================================== > --- head/usr.sbin/sysinstall/install.c Fri Jul 16 20:28:45 2010 (r210174) > +++ head/usr.sbin/sysinstall/install.c Fri Jul 16 20:42:20 2010 (r210175) > @@ -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 or SLIP/PPP network devices?")) { > + if (!msgYesNo("Would you like to configure any Ethernet 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 Fri Jul 16 20:28:45 2010 (r210174) > +++ head/usr.sbin/sysinstall/menus.c Fri Jul 16 20:42:20 2010 (r210175) > @@ -882,13 +882,8 @@ DMenu MenuMediaFTP = { > DMenu MenuNetworkDevice = { > DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS, > "Network interface information required", > - "If you are using PPP over a serial device, as opposed to a direct\n" > - "ethernet connection, then you may first need to dial your Internet\n" > - "Service Provider using the ppp utility we provide for that purpose.\n" > - "If you're using SLIP over a serial device then the expectation is\n" > - "that you have a HARDWIRED connection.\n\n" > - "You can also install over a parallel port using a special \"laplink\"\n" > - "cable to another machine running FreeBSD.", > + "Please select the ethernet device to configure.\n\n" > + "", > "Press F1 to read network configuration manual", > "network_device", > { { NULL } }, > We still support PLIP (with a laplink cable) since a plip0 interface is displayed on this screen during installation if you have a parallel port on the motherboard. So maybe we should reword that with "Please select the Ethernet or the PLIP device to configure.\n\n" -- Marc