6 files changed, 247 insertions, 18 deletions

diff --git a/release/Makefile b/release/Makefile
index 04e505b41472..8737043f5aa3 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.427 1998/11/06 17:29:08 jkh Exp $
+#	$Id: Makefile,v 1.428 1998/11/08 20:47:57 jkh Exp $
 #
 # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
 #
@@ -675,24 +675,8 @@ doKERNEL:
 #
 doMFSKERN:
 	@rm -f ${RD}/kernels/BOOTMFS.${FSIMAGE}
-	@rm -f /sys/compile/BOOTMFS/mfs_vfsops.o
 	@cd ${.CURDIR}/../sys/${MACHINE_ARCH}/conf && \
-	  sed	-e '/pty/d' \
-		-e '/pass0/d' \
-		-e '/apm0/d' \
-		-e '/ft0/d' \
-		-e '/ppp/d' \
-		-e '/gzip/d' \
-		-e '/PROCFS/d' \
-		-e '/SYSVSHM/d' \
-		-e '/KTRACE/d' \
-		-e '/MATH_EMULATE/d' \
-		-e 's/GENERIC/BOOTMFS/g' \
-		-e '/maxusers/s/32/4/' < GENERIC > BOOTMFS && \
-	  echo "options  NFS_NOSERVER" >> BOOTMFS && \
-	  echo 'options  "MAXCONS=4"' >> BOOTMFS && \
-	  echo "options  SCSI_NO_OP_STRINGS" >> BOOTMFS && \
-	  echo "options  SCSI_NO_SENSE_STRINGS" >> BOOTMFS
+	  sh ${.CURDIR}/scripts/dokern.sh ${_MFSKERN-NO} < GENERIC > BOOTMFS
 .if ${MACHINE_ARCH} == "i386"
 	@echo "options  INTRO_USERCONFIG" >> ${.CURDIR}/../sys/i386/conf/BOOTMFS
 .endif
diff --git a/release/alpha/dokern.sh b/release/alpha/dokern.sh
new file mode 100755
index 000000000000..251d6283667b
--- /dev/null
+++ b/release/alpha/dokern.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# From the kernel config file on stdin (usually GENERIC), pare out items as
+# determined by whether or not the kernel is being prepared to contain
+# an MFS ($1 = YES) or will have the floppy image all to itself ($1 = NO).
+
+if [ $# -lt 1 ]; then
+	echo "usage: $0 YES|NO
+	exit 1
+fi
+
+MFS=$1
+
+if [ "$MFS" = "YES" ]; then
+	sed	-e '/pty/d' \
+		-e '/eisa/d' \
+		-e '/wfd0/d' \
+		-e '/aha0/d' \
+		-e '/ahb0/d' \
+		-e '/mcd0/d' \
+		-e '/matcd0/d' \
+		-e '/scd0/d' \
+		-e '/wt0/d' \
+		-e '/pass0/d' \
+		-e '/apm0/d' \
+		-e '/ft0/d' \
+		-e '/ppp/d' \
+		-e '/gzip/d' \
+		-e '/PROCFS/d' \
+		-e '/SYSVSHM/d' \
+		-e '/KTRACE/d' \
+		-e '/MATH_EMULATE/d' \
+		-e 's/GENERIC/BOOTMFS/g' \
+		-e '/maxusers/s/32/4/'
+elif [ "$MFS" = "NO" ]; then		# can be much bigger
+	sed	-e '/pty/d' \
+		-e '/pass0/d' \
+		-e '/apm0/d' \
+		-e '/ppp/d' \
+		-e '/gzip/d' \
+		-e '/PROCFS/d' \
+		-e '/KTRACE/d' \
+		-e '/MATH_EMULATE/d' \
+		-e 's/GENERIC/BOOTMFS/g' \
+fi
+echo "options  NFS_NOSERVER" 
+echo 'options  "MAXCONS=4"' 
+echo "options  SCSI_NO_OP_STRINGS" 
+echo "options  SCSI_NO_SENSE_STRINGS"
diff --git a/release/amd64/dokern.sh b/release/amd64/dokern.sh
new file mode 100755
index 000000000000..251d6283667b
--- /dev/null
+++ b/release/amd64/dokern.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# From the kernel config file on stdin (usually GENERIC), pare out items as
+# determined by whether or not the kernel is being prepared to contain
+# an MFS ($1 = YES) or will have the floppy image all to itself ($1 = NO).
+
+if [ $# -lt 1 ]; then
+	echo "usage: $0 YES|NO
+	exit 1
+fi
+
+MFS=$1
+
+if [ "$MFS" = "YES" ]; then
+	sed	-e '/pty/d' \
+		-e '/eisa/d' \
+		-e '/wfd0/d' \
+		-e '/aha0/d' \
+		-e '/ahb0/d' \
+		-e '/mcd0/d' \
+		-e '/matcd0/d' \
+		-e '/scd0/d' \
+		-e '/wt0/d' \
+		-e '/pass0/d' \
+		-e '/apm0/d' \
+		-e '/ft0/d' \
+		-e '/ppp/d' \
+		-e '/gzip/d' \
+		-e '/PROCFS/d' \
+		-e '/SYSVSHM/d' \
+		-e '/KTRACE/d' \
+		-e '/MATH_EMULATE/d' \
+		-e 's/GENERIC/BOOTMFS/g' \
+		-e '/maxusers/s/32/4/'
+elif [ "$MFS" = "NO" ]; then		# can be much bigger
+	sed	-e '/pty/d' \
+		-e '/pass0/d' \
+		-e '/apm0/d' \
+		-e '/ppp/d' \
+		-e '/gzip/d' \
+		-e '/PROCFS/d' \
+		-e '/KTRACE/d' \
+		-e '/MATH_EMULATE/d' \
+		-e 's/GENERIC/BOOTMFS/g' \
+fi
+echo "options  NFS_NOSERVER" 
+echo 'options  "MAXCONS=4"' 
+echo "options  SCSI_NO_OP_STRINGS" 
+echo "options  SCSI_NO_SENSE_STRINGS"
diff --git a/release/i386/dokern.sh b/release/i386/dokern.sh
new file mode 100755
index 000000000000..251d6283667b
--- /dev/null
+++ b/release/i386/dokern.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# From the kernel config file on stdin (usually GENERIC), pare out items as
+# determined by whether or not the kernel is being prepared to contain
+# an MFS ($1 = YES) or will have the floppy image all to itself ($1 = NO).
+
+if [ $# -lt 1 ]; then
+	echo "usage: $0 YES|NO
+	exit 1
+fi
+
+MFS=$1
+
+if [ "$MFS" = "YES" ]; then
+	sed	-e '/pty/d' \
+		-e '/eisa/d' \
+		-e '/wfd0/d' \
+		-e '/aha0/d' \
+		-e '/ahb0/d' \
+		-e '/mcd0/d' \
+		-e '/matcd0/d' \
+		-e '/scd0/d' \
+		-e '/wt0/d' \
+		-e '/pass0/d' \
+		-e '/apm0/d' \
+		-e '/ft0/d' \
+		-e '/ppp/d' \
+		-e '/gzip/d' \
+		-e '/PROCFS/d' \
+		-e '/SYSVSHM/d' \
+		-e '/KTRACE/d' \
+		-e '/MATH_EMULATE/d' \
+		-e 's/GENERIC/BOOTMFS/g' \
+		-e '/maxusers/s/32/4/'
+elif [ "$MFS" = "NO" ]; then		# can be much bigger
+	sed	-e '/pty/d' \
+		-e '/pass0/d' \
+		-e '/apm0/d' \
+		-e '/ppp/d' \
+		-e '/gzip/d' \
+		-e '/PROCFS/d' \
+		-e '/KTRACE/d' \
+		-e '/MATH_EMULATE/d' \
+		-e 's/GENERIC/BOOTMFS/g' \
+fi
+echo "options  NFS_NOSERVER" 
+echo 'options  "MAXCONS=4"' 
+echo "options  SCSI_NO_OP_STRINGS" 
+echo "options  SCSI_NO_SENSE_STRINGS"
diff --git a/release/pc98/dokern.sh b/release/pc98/dokern.sh
new file mode 100755
index 000000000000..251d6283667b
--- /dev/null
+++ b/release/pc98/dokern.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# From the kernel config file on stdin (usually GENERIC), pare out items as
+# determined by whether or not the kernel is being prepared to contain
+# an MFS ($1 = YES) or will have the floppy image all to itself ($1 = NO).
+
+if [ $# -lt 1 ]; then
+	echo "usage: $0 YES|NO
+	exit 1
+fi
+
+MFS=$1
+
+if [ "$MFS" = "YES" ]; then
+	sed	-e '/pty/d' \
+		-e '/eisa/d' \
+		-e '/wfd0/d' \
+		-e '/aha0/d' \
+		-e '/ahb0/d' \
+		-e '/mcd0/d' \
+		-e '/matcd0/d' \
+		-e '/scd0/d' \
+		-e '/wt0/d' \
+		-e '/pass0/d' \
+		-e '/apm0/d' \
+		-e '/ft0/d' \
+		-e '/ppp/d' \
+		-e '/gzip/d' \
+		-e '/PROCFS/d' \
+		-e '/SYSVSHM/d' \
+		-e '/KTRACE/d' \
+		-e '/MATH_EMULATE/d' \
+		-e 's/GENERIC/BOOTMFS/g' \
+		-e '/maxusers/s/32/4/'
+elif [ "$MFS" = "NO" ]; then		# can be much bigger
+	sed	-e '/pty/d' \
+		-e '/pass0/d' \
+		-e '/apm0/d' \
+		-e '/ppp/d' \
+		-e '/gzip/d' \
+		-e '/PROCFS/d' \
+		-e '/KTRACE/d' \
+		-e '/MATH_EMULATE/d' \
+		-e 's/GENERIC/BOOTMFS/g' \
+fi
+echo "options  NFS_NOSERVER" 
+echo 'options  "MAXCONS=4"' 
+echo "options  SCSI_NO_OP_STRINGS" 
+echo "options  SCSI_NO_SENSE_STRINGS"
diff --git a/release/scripts/dokern.sh b/release/scripts/dokern.sh
new file mode 100755
index 000000000000..251d6283667b
--- /dev/null
+++ b/release/scripts/dokern.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# From the kernel config file on stdin (usually GENERIC), pare out items as
+# determined by whether or not the kernel is being prepared to contain
+# an MFS ($1 = YES) or will have the floppy image all to itself ($1 = NO).
+
+if [ $# -lt 1 ]; then
+	echo "usage: $0 YES|NO
+	exit 1
+fi
+
+MFS=$1
+
+if [ "$MFS" = "YES" ]; then
+	sed	-e '/pty/d' \
+		-e '/eisa/d' \
+		-e '/wfd0/d' \
+		-e '/aha0/d' \
+		-e '/ahb0/d' \
+		-e '/mcd0/d' \
+		-e '/matcd0/d' \
+		-e '/scd0/d' \
+		-e '/wt0/d' \
+		-e '/pass0/d' \
+		-e '/apm0/d' \
+		-e '/ft0/d' \
+		-e '/ppp/d' \
+		-e '/gzip/d' \
+		-e '/PROCFS/d' \
+		-e '/SYSVSHM/d' \
+		-e '/KTRACE/d' \
+		-e '/MATH_EMULATE/d' \
+		-e 's/GENERIC/BOOTMFS/g' \
+		-e '/maxusers/s/32/4/'
+elif [ "$MFS" = "NO" ]; then		# can be much bigger
+	sed	-e '/pty/d' \
+		-e '/pass0/d' \
+		-e '/apm0/d' \
+		-e '/ppp/d' \
+		-e '/gzip/d' \
+		-e '/PROCFS/d' \
+		-e '/KTRACE/d' \
+		-e '/MATH_EMULATE/d' \
+		-e 's/GENERIC/BOOTMFS/g' \
+fi
+echo "options  NFS_NOSERVER" 
+echo 'options  "MAXCONS=4"' 
+echo "options  SCSI_NO_OP_STRINGS" 
+echo "options  SCSI_NO_SENSE_STRINGS"