Totally revamp the TCP/IP dialog; now network selection makes a bit more sense.

Root floppy (which actually may be able to go completely away at some point
soon!) is now loadable from ftp/nfs/dos as well as CDROM and (of course)
floppy.

Fix more problems on Poul's Gripe List.

1 files changed, 3 insertions, 6 deletions

diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index e3e6a0b..3d2234c 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: media.c,v 1.15 1995/05/23 02:41:09 jkh Exp $
+ * $Id: media.c,v 1.16 1995/05/24 09:00:40 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -251,12 +251,9 @@ int
 mediaSetFTP(char *str)
 {
     static Device ftpDevice;
-    Device *devp;
     char *cp;
 
-    devp = tcpDeviceSelect();
-    if (!devp)
-	return 0;
+    tcpDeviceSelect(NULL);
     dmenuOpenSimple(&MenuMediaFTP);
     cp = getenv("ftp");
     if (!cp)
@@ -266,7 +263,7 @@ mediaSetFTP(char *str)
     ftpDevice.init = mediaInitFTP;
     ftpDevice.get = mediaGetFTP;
     ftpDevice.shutdown = mediaShutdownFTP;
-    ftpDevice.private = devp;
+    ftpDevice.private = mediaDevice;
     mediaDevice = &ftpDevice;
     return 1;
 }