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 _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"