Finally conditionalize the SCSI frobbing code properly. This

should return kernel config saving (under the current a.out system)
to its former functionality.

4 files changed, 12 insertions, 9 deletions

diff --git a/release/Makefile b/release/Makefile
index 1be5657..2a12991 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.392 1998/09/24 02:01:07 jkh Exp $
+#	$Id: Makefile,v 1.393 1998/09/28 17:17:49 jkh Exp $
 #
 # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
 #
@@ -632,6 +632,7 @@ fixit.flp:
 write_mfs_in_kernel:	${.CURDIR}/write_mfs_in_kernel.c
 	${CC} ${CFLAGS} -o write_mfs_in_kernel ${.CURDIR}/write_mfs_in_kernel.c
 
+# Add -DDO_SCSI to CFLAGS to enable scsi frobbing support.
 dumpnlist:	${.CURDIR}/dumpnlist.c
 	${CC} ${CFLAGS} -o dumpnlist ${.CURDIR}/dumpnlist.c
 
diff --git a/release/dumpnlist.c b/release/dumpnlist.c
index ab1c146..565802e 100644
--- a/release/dumpnlist.c
+++ b/release/dumpnlist.c
@@ -16,10 +16,12 @@ struct nlist    nl[] = {
     {"_eisa_dev_list"},
     {"_pcidevice_set"},
     {"_device_list"},
+#ifdef DO_SCSI
     {"_scbusses"},
     {"_scsi_cinit"},
     {"_scsi_dinit"},
     {"_scsi_tinit"},
+#endif
     {""},
 };
 
diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile
index 81f4aca..cb90a66 100644
--- a/release/sysinstall/Makefile
+++ b/release/sysinstall/Makefile
@@ -20,7 +20,7 @@ SRCS=	anonFTP.c attr.c cdrom.c command.c config.c devices.c \
 
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
 CFLAGS+= -I${.CURDIR}/../../sys
-CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG
+CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG # -DDO_SCSI
 
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
diff --git a/release/sysinstall/uc_main.c b/release/sysinstall/uc_main.c
index 1d65c1b..0d1d10a 100644
--- a/release/sysinstall/uc_main.c
+++ b/release/sysinstall/uc_main.c
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * library functions for userconfig library
  *
- * $Id: uc_main.c,v 1.20 1998/09/30 19:37:46 jkh Exp $
+ * $Id: uc_main.c,v 1.21 1998/09/30 20:51:01 jkh Exp $
  */
 
 #include <sys/types.h>
@@ -52,7 +52,7 @@ static struct nlist _nl[] = {
     {"_eisa_dev_list"},
     {"_pcidevice_set"},
     {"_device_list"},
-#ifdef USE_SCSI
+#ifdef DO_SCSI
     {"_scbusses"},
     {"_scsi_cinit"},
     {"_scsi_dinit"},
@@ -211,7 +211,7 @@ uc_open(char *name){
     get_eisa_info(kern);
     if (isDebug())
 	msgDebug("uc_open: got eisa information\n");
-#ifdef USE_SCSI
+#ifdef DO_SCSI
     get_scsi_info(kern);
     if (isDebug())
 	msgDebug("uc_open: got scsi information\n");
@@ -234,7 +234,7 @@ uc_close(struct kernel *kern, int writeback)
     if (kern->pci_devp)
 	pci_free(kern, writeback); /* or here */
     
-#ifdef USE_SCSI
+#ifdef DO_SCSI
     if (kern->scsi_devp)
 	scsi_free(kern, writeback);
 #endif
@@ -265,7 +265,7 @@ uc_getdev(struct kernel *kern, char *dev)
 	    if (kern->pci_devp)
 		list_append(list, "pci");
 	    
-#ifdef USE_SCSI
+#ifdef DO_SCSI
 	    if (kern->scsi_devp)
 		list_append(list, "scsi");
 #endif
@@ -277,7 +277,7 @@ uc_getdev(struct kernel *kern, char *dev)
 	    list = get_eisa_devlist(kern);
 	else if (strcmp(dev, "-pci") == 0)
 	    list = get_pci_devlist(kern);
-#ifdef USE_SCSI
+#ifdef DO_SCSI
 	else if (strcmp(dev, "-scsi") == 0)
 	    list = get_scsi_devlist(kern);
 #endif
@@ -297,7 +297,7 @@ uc_getdev(struct kernel *kern, char *dev)
 	    }
 	}
 	
-#ifdef USE_SCSI
+#ifdef DO_SCSI
 	if (kern->scsi_devp) {
 	    struct uc_scsi *sp;