From f656dfa6bfd27e9af1595fa8abaf6cf7c1d668bc Mon Sep 17 00:00:00 2001 From: jkh Date: Thu, 12 Nov 1998 20:40:45 +0000 Subject: Simplify call to dokern.sh - now the no MFS case is the default. --- release/Makefile | 4 ++-- release/alpha/dokern.sh | 12 ++++++------ release/amd64/dokern.sh | 12 ++++++------ release/i386/dokern.sh | 12 ++++++------ release/pc98/dokern.sh | 12 ++++++------ release/scripts/dokern.sh | 12 ++++++------ 6 files changed, 32 insertions(+), 32 deletions(-) (limited to 'release') diff --git a/release/Makefile b/release/Makefile index 8737043..505daad 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.428 1998/11/08 20:47:57 jkh Exp $ +# $Id: Makefile,v 1.429 1998/11/11 08:46:52 jkh Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ] # @@ -676,7 +676,7 @@ doKERNEL: doMFSKERN: @rm -f ${RD}/kernels/BOOTMFS.${FSIMAGE} @cd ${.CURDIR}/../sys/${MACHINE_ARCH}/conf && \ - sh ${.CURDIR}/scripts/dokern.sh ${_MFSKERN-NO} < GENERIC > BOOTMFS + sh ${.CURDIR}/scripts/dokern.sh ${_MFSKERN} < 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 index 9e41000..98d5d92 100755 --- a/release/alpha/dokern.sh +++ b/release/alpha/dokern.sh @@ -2,15 +2,15 @@ # 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). +# an MFS ($1 = YES) or will have the floppy image all to itself ($1 = NO or +# not specified). if [ $# -lt 1 ]; then - echo "usage: $0 YES|NO" - exit 1 + MFS=NO +else + MFS=$1 fi -MFS=$1 - if [ "$MFS" = "YES" ]; then sed -e '/pty/d' \ -e '/eisa/d' \ @@ -32,7 +32,7 @@ if [ "$MFS" = "YES" ]; then -e '/MATH_EMULATE/d' \ -e 's/GENERIC/BOOTMFS/g' \ -e '/maxusers/s/32/4/' -elif [ "$MFS" = "NO" ]; then # can be much bigger +else sed -e '/pty/d' \ -e '/pass0/d' \ -e '/apm0/d' \ diff --git a/release/amd64/dokern.sh b/release/amd64/dokern.sh index 9e41000..98d5d92 100755 --- a/release/amd64/dokern.sh +++ b/release/amd64/dokern.sh @@ -2,15 +2,15 @@ # 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). +# an MFS ($1 = YES) or will have the floppy image all to itself ($1 = NO or +# not specified). if [ $# -lt 1 ]; then - echo "usage: $0 YES|NO" - exit 1 + MFS=NO +else + MFS=$1 fi -MFS=$1 - if [ "$MFS" = "YES" ]; then sed -e '/pty/d' \ -e '/eisa/d' \ @@ -32,7 +32,7 @@ if [ "$MFS" = "YES" ]; then -e '/MATH_EMULATE/d' \ -e 's/GENERIC/BOOTMFS/g' \ -e '/maxusers/s/32/4/' -elif [ "$MFS" = "NO" ]; then # can be much bigger +else sed -e '/pty/d' \ -e '/pass0/d' \ -e '/apm0/d' \ diff --git a/release/i386/dokern.sh b/release/i386/dokern.sh index 9e41000..98d5d92 100755 --- a/release/i386/dokern.sh +++ b/release/i386/dokern.sh @@ -2,15 +2,15 @@ # 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). +# an MFS ($1 = YES) or will have the floppy image all to itself ($1 = NO or +# not specified). if [ $# -lt 1 ]; then - echo "usage: $0 YES|NO" - exit 1 + MFS=NO +else + MFS=$1 fi -MFS=$1 - if [ "$MFS" = "YES" ]; then sed -e '/pty/d' \ -e '/eisa/d' \ @@ -32,7 +32,7 @@ if [ "$MFS" = "YES" ]; then -e '/MATH_EMULATE/d' \ -e 's/GENERIC/BOOTMFS/g' \ -e '/maxusers/s/32/4/' -elif [ "$MFS" = "NO" ]; then # can be much bigger +else sed -e '/pty/d' \ -e '/pass0/d' \ -e '/apm0/d' \ diff --git a/release/pc98/dokern.sh b/release/pc98/dokern.sh index 9e41000..98d5d92 100755 --- a/release/pc98/dokern.sh +++ b/release/pc98/dokern.sh @@ -2,15 +2,15 @@ # 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). +# an MFS ($1 = YES) or will have the floppy image all to itself ($1 = NO or +# not specified). if [ $# -lt 1 ]; then - echo "usage: $0 YES|NO" - exit 1 + MFS=NO +else + MFS=$1 fi -MFS=$1 - if [ "$MFS" = "YES" ]; then sed -e '/pty/d' \ -e '/eisa/d' \ @@ -32,7 +32,7 @@ if [ "$MFS" = "YES" ]; then -e '/MATH_EMULATE/d' \ -e 's/GENERIC/BOOTMFS/g' \ -e '/maxusers/s/32/4/' -elif [ "$MFS" = "NO" ]; then # can be much bigger +else sed -e '/pty/d' \ -e '/pass0/d' \ -e '/apm0/d' \ diff --git a/release/scripts/dokern.sh b/release/scripts/dokern.sh index 9e41000..98d5d92 100755 --- a/release/scripts/dokern.sh +++ b/release/scripts/dokern.sh @@ -2,15 +2,15 @@ # 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). +# an MFS ($1 = YES) or will have the floppy image all to itself ($1 = NO or +# not specified). if [ $# -lt 1 ]; then - echo "usage: $0 YES|NO" - exit 1 + MFS=NO +else + MFS=$1 fi -MFS=$1 - if [ "$MFS" = "YES" ]; then sed -e '/pty/d' \ -e '/eisa/d' \ @@ -32,7 +32,7 @@ if [ "$MFS" = "YES" ]; then -e '/MATH_EMULATE/d' \ -e 's/GENERIC/BOOTMFS/g' \ -e '/maxusers/s/32/4/' -elif [ "$MFS" = "NO" ]; then # can be much bigger +else sed -e '/pty/d' \ -e '/pass0/d' \ -e '/apm0/d' \ -- cgit v1.1