Simplify call to dokern.sh - now the no MFS case is the default.
This commit is contained in:
Jordan K. Hubbard
parent
a1d0a42349
commit
1da84da101
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=41115
@ -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
|
||||
|
||||
@ -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' \
|
||||
|
||||
@ -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' \
|
||||
|
||||
@ -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' \
|
||||
|
||||
@ -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' \
|
||||
|
||||
@ -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' \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user