From ccfcf93e5340cdce5ea948fd820b29318f2e88b6 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Tue, 26 Jan 1999 15:14:11 +0000 Subject: [PATCH] 1. Adjust fs sizes to get floppies back under control. 2. Viciously slash all CD support out of boot.flp. It's basically just a net boot floppy now. --- release/alpha/dokern.sh | 17 +++++++++++++---- release/amd64/dokern.sh | 17 +++++++++++++---- release/i386/dokern.sh | 17 +++++++++++++---- release/pc98/dokern.sh | 17 +++++++++++++---- release/scripts/doFS.sh | 2 +- release/scripts/dokern.sh | 17 +++++++++++++---- 6 files changed, 66 insertions(+), 21 deletions(-) diff --git a/release/alpha/dokern.sh b/release/alpha/dokern.sh index 0f6cac8cbaa..53cb8eb8d2c 100755 --- a/release/alpha/dokern.sh +++ b/release/alpha/dokern.sh @@ -13,19 +13,28 @@ fi if [ "$MFS" = "YES" ]; then sed -e '/pty/d' \ - -e '/wfd0/d' \ + -e '/acd0/d' \ + -e '/cd0/d' \ -e '/mcd0/d' \ -e '/matcd0/d' \ -e '/scd0/d' \ + -e '/ft0/d' \ -e '/wt0/d' \ + -e '/wfd0/d' \ -e '/pass0/d' \ -e '/apm0/d' \ - -e '/ft0/d' \ -e '/ppp/d' \ + -e '/eisa0/d' \ + -e '/aha0/d' \ + -e '/ahb0/d' \ + -e '/bt0/d' \ + -e '/fd1/d' \ + -e '/splash/d' \ -e '/gzip/d' \ - -e '/isp0/d' \ -e '/NFS/d' \ -e '/PROCFS/d' \ + -e '/MSDOSFS/d' \ + -e '/CD9660/d' \ -e '/SYSVSHM/d' \ -e '/KTRACE/d' \ -e '/MATH_EMULATE/d' \ @@ -37,11 +46,11 @@ else -e '/apm0/d' \ -e '/ppp/d' \ -e '/gzip/d' \ + -e '/splash/d' \ -e '/PROCFS/d' \ -e '/KTRACE/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 index 0f6cac8cbaa..53cb8eb8d2c 100755 --- a/release/amd64/dokern.sh +++ b/release/amd64/dokern.sh @@ -13,19 +13,28 @@ fi if [ "$MFS" = "YES" ]; then sed -e '/pty/d' \ - -e '/wfd0/d' \ + -e '/acd0/d' \ + -e '/cd0/d' \ -e '/mcd0/d' \ -e '/matcd0/d' \ -e '/scd0/d' \ + -e '/ft0/d' \ -e '/wt0/d' \ + -e '/wfd0/d' \ -e '/pass0/d' \ -e '/apm0/d' \ - -e '/ft0/d' \ -e '/ppp/d' \ + -e '/eisa0/d' \ + -e '/aha0/d' \ + -e '/ahb0/d' \ + -e '/bt0/d' \ + -e '/fd1/d' \ + -e '/splash/d' \ -e '/gzip/d' \ - -e '/isp0/d' \ -e '/NFS/d' \ -e '/PROCFS/d' \ + -e '/MSDOSFS/d' \ + -e '/CD9660/d' \ -e '/SYSVSHM/d' \ -e '/KTRACE/d' \ -e '/MATH_EMULATE/d' \ @@ -37,11 +46,11 @@ else -e '/apm0/d' \ -e '/ppp/d' \ -e '/gzip/d' \ + -e '/splash/d' \ -e '/PROCFS/d' \ -e '/KTRACE/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 index 0f6cac8cbaa..53cb8eb8d2c 100755 --- a/release/i386/dokern.sh +++ b/release/i386/dokern.sh @@ -13,19 +13,28 @@ fi if [ "$MFS" = "YES" ]; then sed -e '/pty/d' \ - -e '/wfd0/d' \ + -e '/acd0/d' \ + -e '/cd0/d' \ -e '/mcd0/d' \ -e '/matcd0/d' \ -e '/scd0/d' \ + -e '/ft0/d' \ -e '/wt0/d' \ + -e '/wfd0/d' \ -e '/pass0/d' \ -e '/apm0/d' \ - -e '/ft0/d' \ -e '/ppp/d' \ + -e '/eisa0/d' \ + -e '/aha0/d' \ + -e '/ahb0/d' \ + -e '/bt0/d' \ + -e '/fd1/d' \ + -e '/splash/d' \ -e '/gzip/d' \ - -e '/isp0/d' \ -e '/NFS/d' \ -e '/PROCFS/d' \ + -e '/MSDOSFS/d' \ + -e '/CD9660/d' \ -e '/SYSVSHM/d' \ -e '/KTRACE/d' \ -e '/MATH_EMULATE/d' \ @@ -37,11 +46,11 @@ else -e '/apm0/d' \ -e '/ppp/d' \ -e '/gzip/d' \ + -e '/splash/d' \ -e '/PROCFS/d' \ -e '/KTRACE/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 index 0f6cac8cbaa..53cb8eb8d2c 100755 --- a/release/pc98/dokern.sh +++ b/release/pc98/dokern.sh @@ -13,19 +13,28 @@ fi if [ "$MFS" = "YES" ]; then sed -e '/pty/d' \ - -e '/wfd0/d' \ + -e '/acd0/d' \ + -e '/cd0/d' \ -e '/mcd0/d' \ -e '/matcd0/d' \ -e '/scd0/d' \ + -e '/ft0/d' \ -e '/wt0/d' \ + -e '/wfd0/d' \ -e '/pass0/d' \ -e '/apm0/d' \ - -e '/ft0/d' \ -e '/ppp/d' \ + -e '/eisa0/d' \ + -e '/aha0/d' \ + -e '/ahb0/d' \ + -e '/bt0/d' \ + -e '/fd1/d' \ + -e '/splash/d' \ -e '/gzip/d' \ - -e '/isp0/d' \ -e '/NFS/d' \ -e '/PROCFS/d' \ + -e '/MSDOSFS/d' \ + -e '/CD9660/d' \ -e '/SYSVSHM/d' \ -e '/KTRACE/d' \ -e '/MATH_EMULATE/d' \ @@ -37,11 +46,11 @@ else -e '/apm0/d' \ -e '/ppp/d' \ -e '/gzip/d' \ + -e '/splash/d' \ -e '/PROCFS/d' \ -e '/KTRACE/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/doFS.sh b/release/scripts/doFS.sh index 0a63deee3a9..ec56ae7d0f8 100644 --- a/release/scripts/doFS.sh +++ b/release/scripts/doFS.sh @@ -43,7 +43,7 @@ do vnconfig -s labels -c /dev/r${VNDEVICE} ${FSIMG} disklabel -Brw /dev/r${VNDEVICE} ${FSLABEL} - newfs -u 0 -t 0 -i ${FSINODE} -m 0 -T ${FSLABEL} -o space /dev/r${VNDEVICE}c + newfs -i ${FSINODE} -T ${FSLABEL} -o space /dev/r${VNDEVICE}c mount /dev/${VNDEVICE}c ${MNT} diff --git a/release/scripts/dokern.sh b/release/scripts/dokern.sh index 0f6cac8cbaa..53cb8eb8d2c 100755 --- a/release/scripts/dokern.sh +++ b/release/scripts/dokern.sh @@ -13,19 +13,28 @@ fi if [ "$MFS" = "YES" ]; then sed -e '/pty/d' \ - -e '/wfd0/d' \ + -e '/acd0/d' \ + -e '/cd0/d' \ -e '/mcd0/d' \ -e '/matcd0/d' \ -e '/scd0/d' \ + -e '/ft0/d' \ -e '/wt0/d' \ + -e '/wfd0/d' \ -e '/pass0/d' \ -e '/apm0/d' \ - -e '/ft0/d' \ -e '/ppp/d' \ + -e '/eisa0/d' \ + -e '/aha0/d' \ + -e '/ahb0/d' \ + -e '/bt0/d' \ + -e '/fd1/d' \ + -e '/splash/d' \ -e '/gzip/d' \ - -e '/isp0/d' \ -e '/NFS/d' \ -e '/PROCFS/d' \ + -e '/MSDOSFS/d' \ + -e '/CD9660/d' \ -e '/SYSVSHM/d' \ -e '/KTRACE/d' \ -e '/MATH_EMULATE/d' \ @@ -37,11 +46,11 @@ else -e '/apm0/d' \ -e '/ppp/d' \ -e '/gzip/d' \ + -e '/splash/d' \ -e '/PROCFS/d' \ -e '/KTRACE/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"