Remove some bogosities I introduced with the init file hack (not serious,

just bogus).  Also turn off by default - whoops!

3 files changed, 12 insertions, 8 deletions

diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile
index e333b0a..b880379 100644
--- a/release/sysinstall/Makefile
+++ b/release/sysinstall/Makefile
@@ -13,7 +13,7 @@ SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
 
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
 
-CFLAGS+=	-DLOAD_CONFIG_FILE=\"install.cfg\"
+#CFLAGS+=	-DLOAD_CONFIG_FILE=\"install.cfg\"
 
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk
diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c
index ac1b175..0b9991e 100644
--- a/release/sysinstall/floppy.c
+++ b/release/sysinstall/floppy.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: floppy.c,v 1.13 1996/07/02 01:03:41 jkh Exp $
+ * $Id: floppy.c,v 1.14 1996/07/08 08:54:25 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -54,7 +54,7 @@
 static Device *floppyDev;
 static Boolean floppyMounted;
 
-static char *distWanted;
+char *distWanted;
 
 /* For finding floppies */
 static int
@@ -127,9 +127,9 @@ mediaInitFloppy(Device *dev)
     }
     msgDebug("Init floppy called for %s distribution.\n", distWanted ? distWanted : "some");
     if (!distWanted)
-    	msgConfirm("Please insert next floppy into %s", dev->description);
-    else
-	msgConfirm("Please insert floppy containing %s into %s", distWanted, dev->description);
+    	msgConfirm("Please insert floppy for %s", dev->description);
+    else if (distWanted != (char *)1)	/* 1 is kludge for "don't ask!" */
+	msgConfirm("Please insert floppy containing %s for %s", distWanted, dev->description);
 
     memset(&dosargs, 0, sizeof dosargs);
     dosargs.fspec = dev->devname;
@@ -141,7 +141,8 @@ mediaInitFloppy(Device *dev)
 
     if (mount(MOUNT_MSDOS, "/dist", MNT_RDONLY, (caddr_t)&dosargs) == -1) {
 	if (mount(MOUNT_UFS, "/dist", MNT_RDONLY, (caddr_t)&u_args) == -1) {
-	    msgConfirm("Error mounting floppy %s (%s) on /dist : %s", dev->name, dev->devname, strerror(errno));
+	    if (distWanted != (char *)1)
+		msgConfirm("Error mounting floppy %s (%s) on /dist : %s", dev->name, dev->devname, strerror(errno));
 	    return FALSE;
 	}
     }
diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c
index 2149899..5f42e4b 100644
--- a/release/sysinstall/main.c
+++ b/release/sysinstall/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: main.c,v 1.25 1996/07/22 18:43:21 jkh Exp $
+ * $Id: main.c,v 1.26 1996/09/08 01:39:24 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -113,6 +113,9 @@ main(int argc, char **argv)
 /* If we have a compiled-in startup config file name, look for it and try to load it on startup */
 #if defined(LOAD_CONFIG_FILE)
     else {
+	extern char *distWanted;
+
+	distWanted = (char *)1;	/* Tell mediaSetFloppy() to try floppy now */
 	/* Try to open the floppy drive if we can do that first */
 	if (DITEM_STATUS(mediaSetFloppy(NULL)) != DITEM_FAILURE && mediaDevice->init(mediaDevice)) {
 	    int fd;