Index: release/Makefile
===================================================================
RCS file: /a/ncvs/src/release/Makefile,v
retrieving revision 1.536.2.66
diff -u -r1.536.2.66 Makefile
--- release/Makefile	7 Jan 2002 07:42:40 -0000	1.536.2.66
+++ release/Makefile	16 Jan 2002 10:18:46 -0000
@@ -628,11 +628,21 @@
 	@mkdir -p ${RD}/mfsfd/boot
 	@cp /boot/boot* ${RD}/mfsfd/boot
 	@cp /boot/loader.help ${RD}/mfsfd/boot
+	@cd ${.CURDIR} && ${MAKE} createBOOTMFS 
+.if exists(${.CURDIR}/${MACHINE}/drivers.conf)
+	@cd ${.CURDIR} && ${MAKE} doMODULES KERNEL=BOOTMFS KERNEL_KO=BOOTMFS KODIR=""
+.endif
 	@echo "Making the regular boot floppy."
 	@tar --exclude CVS -cf - -C ${.CURDIR}/sysinstall help | \
 		tar xf - -C ${RD}/mfsfd/stand
 	@echo "Compressing doc files..."
 	@gzip -9 ${RD}/mfsfd/stand/help/*.hlp
+.if exists(${.CURDIR}/${MACHINE}/drivers.conf)
+	@mkdir -p ${RD}/mfsfd/stand/modules
+	@perl ${.CURDIR}/scripts/driver-copy2.pl \
+		${.CURDIR}/${MACHINE}/drivers.conf \
+		${RD}/kernels/modules ${RD}/mfsfd/stand/modules
+.endif
 	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \
 		${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
 	@gzip -9vc mfsroot > mfsroot.gz
@@ -900,6 +910,24 @@
 	fi
 
 #
+# --==## BOOTMFS config file ##==--
+#
+
+createBOOTMFS:
+	echo "XXX In createBOOTMFS"
+	@cd ${.CURDIR}/../sys/${MACHINE}/conf && \
+	  sh ${.CURDIR}/scripts/dokern.sh ${FDSIZE} < ${KERNCONF} > BOOTMFS
+.if 0 && ${MACHINE_ARCH} == "i386"
+	@echo "options  INTRO_USERCONFIG" >> \
+	  ${.CURDIR}/../sys/${MACHINE}/conf/BOOTMFS
+.endif
+.if exists(${.CURDIR}/${MACHINE}/drivers.conf)
+	@perl ${.CURDIR}/scripts/driver-remove.pl \
+		${.CURDIR}/${MACHINE}/drivers.conf \
+		${.CURDIR}/../sys/${MACHINE}/conf/BOOTMFS
+.endif
+
+#
 # --==## Compile a kernel by name ${KERNEL} ##==--
 #
 # We don't erase the sys/compile/${KERNEL} directory, since somebody
@@ -913,18 +941,31 @@
 			make ${KERNEL_FLAGS} ${KERNEL} && \
 			make kernel-reinstall DESTDIR=${RD}/kernels
 
+doMODULES:
+	echo "XXX In doMODULES! "
+	-mkdir ${RD}/kernels/modules
+#
+# XXX Many modules install shell script wrappers and other lame things.
+#
+	mtree -deU -f ${MTREEFILES}/BSD.root.dist \
+	    -p ${RD}/kernels > /dev/null && \
+	mtree -deU -f ${MTREEFILES}/BSD.usr.dist \
+	    -p ${RD}/kernels/usr > /dev/null && \
+
+	@rm -f ${RD}/kernels/modules/*.ko
+	@cd ${.CURDIR}/../sys/${MACHINE}/conf && config ${KERNEL}
+	@cd ${.CURDIR}/../sys/compile/${KERNEL} && \
+			make modules-depend && \
+			make ${KERNEL_FLAGS} modules && \
+			make NOMAN=1 modules-reinstall DESTDIR=${RD}/kernels
+
 #
 # --==## Put a filesystem into a BOOTMFS kernel ##==--
 #
 doMFSKERN:
 	@echo "Running doMFSKERN for ${FSIMAGE}"
 	@rm -f ${RD}/kernels/BOOTMFS.${FSIMAGE}
-	@cd ${.CURDIR}/../sys/${MACHINE}/conf && \
-	  sh ${.CURDIR}/scripts/dokern.sh ${FDSIZE} < ${KERNCONF} > BOOTMFS
-.if ${MACHINE_ARCH} == "i386"
-	@echo "options  INTRO_USERCONFIG" >> \
-	  ${.CURDIR}/../sys/${MACHINE}/conf/BOOTMFS
-.endif
+	@cd ${.CURDIR} && ${MAKE} createBOOTMFS 
 	@cd ${.CURDIR} && ${MAKE} doKERNEL KERNEL=BOOTMFS
 	@rm -rf ${RD}/image.${FSIMAGE}
 	@mkdir  ${RD}/image.${FSIMAGE}
Index: release/scripts/dokern.sh
===================================================================
RCS file: /a/ncvs/src/release/scripts/Attic/dokern.sh,v
retrieving revision 1.23.2.23
diff -u -r1.23.2.23 dokern.sh
--- release/scripts/dokern.sh	23 Dec 2001 21:26:57 -0000	1.23.2.23
+++ release/scripts/dokern.sh	16 Jan 2002 07:17:42 -0000
@@ -38,6 +38,7 @@
 	-e '/	vr/d' \
 	-e '/	wb/d' \
 	-e '/	xl/d' \
+	-e '/	an$/d' \
 	-e '/pty/d' \
 	-e '/pass/d' \
 	-e '/	apm/d' \
@@ -48,7 +49,7 @@
 	-e '/splash/d' \
 	-e '/PROCFS/d' \
 	-e '/KTRACE/d' \
-	-e '/SYSV/d' \
+	-e '/SYSVMSG/d' \
 	-e '/SOFTUPDATES/d' \
 	-e '/UFS_DIRHASH/d' \
 	-e '/MFS/d' \
@@ -79,13 +80,14 @@
 	-e '/splash/d' \
 	-e '/PROCFS/d' \
 	-e '/KTRACE/d' \
-	-e '/SYSV/d' \
+	-e '/SYSVMSG/d' \
 	-e '/SOFTUPDATES/d' \
 	-e '/UFS_DIRHASH/d' \
 	-e '/MFS/d' \
 	-e '/NFS_ROOT/d' \
 	-e '/RANDOMDEV/d' \
 	-e '/	ncr/d' \
+	-e '/	an$/d' \
 	-e '/atapist/d' \
 	-e '/lpt/d' \
 	-e '/ppi/d' \