Fixed disk full problem for pc98 distribution. Now, it makes 4 installation

floppies.

kern-small.flp and mfsroot-small.flp are for old machines that don't
support 1.44MB floppy. These floppies don't have pci related devices.

kern.flp and mfsroot.flp are normal 1.44MB floppy images.

4 files changed, 149 insertions, 99 deletions

diff --git a/release/Makefile b/release/Makefile
index d859103..7fbd8cb 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -625,6 +625,35 @@ release.9:
 .if ${TARGET_ARCH} == "alpha"
 	rm -rf ${RD}/mfsfd/stand/help/*
 .endif
+.if ${TARGET} == "pc98"
+.if exists(${.CURDIR}/${TARGET}/drivers-small.conf)
+	@rm -rf ${RD}/mfsfd/stand/modules
+	@mkdir -p ${RD}/mfsfd/stand/modules
+	@awk -f  ${.CURDIR}/scripts/driver-copy2.awk 2 \
+	    ${.CURDIR}/${TARGET}/drivers-small.conf \
+	    ${RD}/trees/base/boot/kernel ${RD}/mfsfd/stand/modules
+.endif
+	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot-small ${RD} ${MNT} \
+		${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
+	@gzip -9vc mfsroot-small > mfsroot-small.gz
+	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot-small.flp \
+		${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot-small.gz \
+		${BOOTINODE} ${SMALLBOOTLABEL}
+.if exists(${.CURDIR}/${TARGET}/drivers.conf)
+	@rm -rf ${RD}/mfsfd/stand/modules
+	@mkdir -p ${RD}/mfsfd/stand/modules
+	@awk -f  ${.CURDIR}/scripts/driver-copy2.awk 2 \
+	    ${.CURDIR}/${TARGET}/drivers.conf \
+	    ${RD}/trees/base/boot/kernel ${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
+	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
+		${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
+	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL
+	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
+.else
 .if exists(${.CURDIR}/${TARGET}/drivers.conf)
 	@mkdir -p ${RD}/mfsfd/stand/modules
 	@awk -f  ${.CURDIR}/scripts/driver-copy2.awk 2 \
@@ -645,13 +674,6 @@ release.9:
 	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \
 		${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
 	@gzip -9vc mfsroot > mfsroot.gz
-.if ${TARGET} == "pc98"
-	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
-		${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \
-		${BOOTINODE} ${SMALLBOOTLABEL}
-	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL
-	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
-.else
 	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
 		${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
 	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
@@ -912,7 +934,12 @@ doMFSKERN:
 	@cd ${.CURDIR}/../sys/${TARGET}/conf && \
 	    sh ${.CURDIR}/${TARGET}/dokern.sh ${FDSIZE} < GENERIC > BOOTMFS && \
 	    [ -r GENERIC.hints ] && cp GENERIC.hints BOOTMFS.hints
-.if exists(${.CURDIR}/${TARGET}/drivers.conf)
+.if defined(FDSIZE) && ${FDSIZE} == "SMALL" && \
+    exists(${.CURDIR}/${TARGET}/drivers-small.conf)
+	@awk -f ${.CURDIR}/scripts/driver-remove.awk \
+		${.CURDIR}/${TARGET}/drivers-small.conf \
+		${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS
+.elif exists(${.CURDIR}/${TARGET}/drivers.conf)
 	@awk -f ${.CURDIR}/scripts/driver-remove.awk \
 		${.CURDIR}/${TARGET}/drivers.conf \
 		${.CURDIR}/../sys/${TARGET}/conf/BOOTMFS
diff --git a/release/pc98/dokern.sh b/release/pc98/dokern.sh
index caca104..22a8172 100755
--- a/release/pc98/dokern.sh
+++ b/release/pc98/dokern.sh
@@ -11,48 +11,51 @@ fi
 
 if [ "${FDSIZE}" = "SMALL" ]; then
 
-sed	-e '/	pty	/d' \
-	-e '/	pass	/d' \
-	-e '/	apm$/d' \
-	-e '/	pmtimer$/d' \
-	-e '/	ppp	/d' \
-	-e '/	gif	/d' \
-	-e '/	faith	/d' \
-	-e '/	random	/d' \
-	-e '/	splash	/d' \
-	-e '/PROCFS/d' \
-	-e '/PSEUDOFS/d' \
-	-e '/KTRACE/d' \
-	-e '/SYSV/d' \
+sed	-e 's/ident.*GENERIC/ident		BOOTMFS/g' \
+	-e '/maxusers/d' \
+	-e '/DEBUG/d' \
 	-e '/SOFTUPDATES/d' \
 	-e '/UFS_DIRHASH/d' \
-	-e '/MFS/d' \
 	-e '/NFSSERVER/d' \
 	-e '/NFS_ROOT/d' \
-	-e '/DEBUG/d' \
+	-e '/PROCFS/d' \
+	-e '/PSEUDOFS/d' \
+	-e '/KTRACE/d' \
+	-e '/SYSV/d' \
 	-e '/DDB/d' \
 	-e '/INVARIANTS/d' \
 	-e '/INVARIANT_SUPPORT/d' \
 	-e '/WITNESS/d' \
-	-e '/AHC_REG_PRETTY_PRINT/d' \
-	-e '/AHD_REG_PRETTY_PRINT/d' \
+	-e '/	ch	/d' \
+	-e '/	sa	/d' \
+	-e '/	pass	/d' \
+	-e '/	ses	/d' \
+	-e '/	splash	/d' \
+	-e '/	apm$/d' \
+	-e '/	pmtimer$/d' \
+	-e '/	ppc$/d' \
+	-e '/	ppbus	/d' \
+	-e '/	lpt	/d' \
+	-e '/	plip	/d' \
+	-e '/	ppi	/d' \
+	-e '/	an	/d' \
+	-e '/	awi	/d' \
+	-e '/	wi	/d' \
+	-e '/	random	/d' \
+	-e '/	sl	/d' \
+	-e '/	ppp	/d' \
+	-e '/	pty	/d' \
+	-e '/	gif	/d' \
+	-e '/	faith	/d' \
 	-e '/	pci$/d' \
 	-e '/	adv	/d' \
 	-e '/	ahc	/d' \
 	-e '/	amd	/d' \
 	-e '/	isp	/d' \
 	-e '/	sym	/d' \
-	-e '/	ncr	/d' \
-	-e '/	ch	/d' \
-	-e '/	sa	/d' \
-	-e '/	ses	/d' \
-	-e '/	pcm/d' \
-	-e '/	atapist	/d' \
 	-e '/	ppc$/d' \
 	-e '/	ppbus	/d' \
-	-e '/	lpt	/d' \
 	-e '/	plip	/d' \
-	-e '/	ppi	/d' \
 	-e '/	de	/d' \
 	-e '/	em	/d' \
 	-e '/	txp	/d' \
@@ -68,60 +71,46 @@ sed	-e '/	pty	/d' \
 	-e '/	tx	/d' \
 	-e '/	vr	/d' \
 	-e '/	wb	/d' \
-	-e '/	xl	/d' \
-	-e '/	ugen	/d' \
-	-e '/	uhid	/d' \
-	-e '/	ulpt	/d' \
-	-e '/	urio	/d' \
-	-e '/	uscanner	/d' \
-	-e '/maxusers/d' \
-	-e 's/ident.*GENERIC/ident		BOOTMFS/g'
+	-e '/	xl	/d'
 
 else
 
-sed	-e '/	pty	/d' \
-	-e '/	pass	/d' \
-	-e '/	apm$/d' \
-	-e '/	pmtimer$/d' \
-	-e '/	ppp	/d' \
-	-e '/	gif	/d' \
-	-e '/	faith	/d' \
-	-e '/	random	/d' \
-	-e '/	splash	/d' \
-	-e '/PROCFS/d' \
-	-e '/PSEUDOFS/d' \
-	-e '/KTRACE/d' \
-	-e '/SYSV/d' \
+sed	-e 's/ident.*GENERIC/ident		BOOTMFS/g' \
+	-e '/maxusers/d' \
+	-e '/DEBUG/d' \
 	-e '/SOFTUPDATES/d' \
 	-e '/UFS_DIRHASH/d' \
-	-e '/MFS/d' \
 	-e '/NFSSERVER/d' \
 	-e '/NFS_ROOT/d' \
- 	-e '/DEBUG/d' \
- 	-e '/DDB/d' \
- 	-e '/INVARIANTS/d' \
- 	-e '/INVARIANT_SUPPORT/d' \
- 	-e '/WITNESS/d' \
-	-e '/AHC_REG_PRETTY_PRINT/d' \
-	-e '/AHD_REG_PRETTY_PRINT/d' \
-	-e '/	ncr	/d' \
+	-e '/PROCFS/d' \
+	-e '/PSEUDOFS/d' \
+	-e '/KTRACE/d' \
+	-e '/SYSV/d' \
+	-e '/DDB/d' \
+	-e '/INVARIANTS/d' \
+	-e '/INVARIANT_SUPPORT/d' \
+	-e '/WITNESS/d' \
 	-e '/	ch	/d' \
 	-e '/	sa	/d' \
-	-e '/	pcm/d' \
-	-e '/	atapist	/d' \
+	-e '/	pass	/d' \
+	-e '/	ses	/d' \
+	-e '/	splash	/d' \
+	-e '/	apm$/d' \
+	-e '/	pmtimer$/d' \
+	-e '/	ppc$/d' \
+	-e '/	ppbus	/d' \
 	-e '/	lpt	/d' \
+	-e '/	plip	/d' \
 	-e '/	ppi	/d' \
-	-e '/	txp	/d' \
-	-e '/	sf	/d' \
-	-e '/	ste	/d' \
-	-e '/	ugen	/d' \
-	-e '/	uhid	/d' \
-	-e '/	ulpt	/d' \
-	-e '/	urio	/d' \
-	-e '/	uscanner	/d' \
-	-e '/	ses	/d' \
-	-e '/maxusers/d' \
-	-e 's/ident.*GENERIC/ident		BOOTMFS/g'
+	-e '/	an	/d' \
+	-e '/	awi	/d' \
+	-e '/	wi	/d' \
+	-e '/	random	/d' \
+	-e '/	sl	/d' \
+	-e '/	ppp	/d' \
+	-e '/	pty	/d' \
+	-e '/	gif	/d' \
+	-e '/	faith	/d'
 
 fi
 
diff --git a/release/pc98/drivers-small.conf b/release/pc98/drivers-small.conf
new file mode 100644
index 0000000..4609465
--- /dev/null
+++ b/release/pc98/drivers-small.conf
@@ -0,0 +1,40 @@
+# Driver config file for boot floppies
+#  
+# Copyright (c) 2000  "HOSOKAWA, Tatsumi" <hosokawa@FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+#
+# drv: driver name in kernel config file
+# filename: filename of kernel module (without .ko)
+# floppy: 2 (mfsroot.flp), 3 (drivers.flp - not implemented yet)
+# type: 'options' (for a kernel option) or anything else for a driver
+# description: short description of the driver
+#
+
+#drv	filename	floppy	type	description
+NFSCLIENT	nfsclient	2	options	"Network Filesystem Client"
+MSDOSFS	msdosfs		2	options	"MSDOS filsystem"
+CD9660	cd9660		2	options	"ISO 9660 Filesystem"
diff --git a/release/pc98/drivers.conf b/release/pc98/drivers.conf
index 1ce5774..2706710 100644
--- a/release/pc98/drivers.conf
+++ b/release/pc98/drivers.conf
@@ -35,28 +35,22 @@
 #
 
 #drv	filename	floppy	type	description
+dc	if_dc		2	network	"DEC/Intel 21143 (and clones) PCI fast ethernet card"
+fxp	if_fxp		2	network	"Intel EtherExpress Pro/100B PCI Fast Ethernet card"
+pcn	if_pcn		2	network	"AMD Am79c79x PCI ethernet card"
+rl	if_rl		2	network	"RealTek 8129/8139 PCI ethernet card"
+sf	if_sf		2	network	"Adaptec AIC-6915 PCI ethernet card"
+sis	if_sis		2	network	"SiS 900/SiS 7016 PCI ethernet card"
+ste	if_ste		2	network	"Sundance ST201 PCI ethernet card"
+tl	if_tl		2	network	"Texas Instruments ThunderLAN PCI ethernet card"
+tx	if_tx		2	network	"SMC 9432TX ethernet card"
+vr	if_vr		2	network	"VIA VT3043/VT86C100A Rhine PCI ethernet card"
+wb	if_wb		2	network	"Winbond W89C840F PCI ethernet card"
+xl	if_xl		2	network	"3COM 3c90x / 3c90xB PCI ethernet card"
 ed	if_ed		2	network	"NE[12]000, SMC Ultra, 3c503, DS8390 cards"
 fe	if_fe		2	network	"Fujitsu MB8696x based cards"
-#an	if_an		2	network	"Aironet 4500/4800 802.11 PCMCIA/ISA/PCI card"
-#aue	if_aue		2	network	"ADMtek USB ethernet adapter"
-#cue	if_cue		2	network	"CATC USB ethernet adapter"
-#dc	if_dc		2	network	"DEC/Intel 21143 (and clones) PCI fast ethernet card"
-#de	if_de		2	network	"DEC DE435 PCI NIC or other DC21040-AA based card"
-#fxp	if_fxp		2	network	"Intel EtherExpress Pro/100B PCI Fast Ethernet card"
-#kue	if_kue		2	network	"Kawasaki LSI USB ethernet adapter"
-#pcn	if_pcn		2	network	"AMD Am79c79x PCI ethernet card"
-#rl	if_rl		2	network	"RealTek 8129/8139 PCI ethernet card"
-#sf	if_sf		2	network	"Adaptec AIC-6915 PCI ethernet card"
-#sis	if_sis		2	network	"SiS 900/SiS 7016 PCI ethernet card"
-#sk	if_sk		2	network	"SysKonnect PCI gigabit ethernet card"
-#ste	if_ste		2	network	"Sundance ST201 PCI ethernet card"
-#ti	if_ti		2	network	"Alteon Networks PCI gigabit ethernet card"
-#tl	if_tl		2	network	"Texas Instruments ThunderLAN PCI ethernet card"
-#tx	if_tx		2	network	"SMC 9432TX ethernet card"
-#vr	if_vr		2	network	"VIA VT3043/VT86C100A Rhine PCI ethernet card"
-#wb	if_wb		2	network	"Winbond W89C840F PCI ethernet card"
-#wi	if_wi		2	network	"Lucent WaveLAN/IEEE 802.11 PCMCIA card"
-#xl	if_xl		2	network	"3COM 3c90x / 3c90xB PCI ethernet card"
-CD9660	cd9660		2	options "ISO 9660 Filesystem"
-MSDOSFS	msdosfs		2	options "MSDOS filsystem"
-NFSCLIENT	nfsclient	2	options "Network Filesystem Client"
+an	if_an		2	network	"Aironet 4500/4800 802.11 PCMCIA/ISA/PCI card"
+wi	if_wi		2	network	"Lucent WaveLAN/IEEE 802.11 PCMCIA card"
+NFSCLIENT	nfsclient	2	options	"Network Filesystem Client"
+MSDOSFS	msdosfs		2	options	"MSDOS filsystem"
+CD9660	cd9660		2	options	"ISO 9660 Filesystem"