Merge from 2.2

This commit is contained in:
jkh 1996-12-14 23:14:39 +00:00
parent a4ac17074b
commit f8038e4188

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.261 1996/12/11 18:26:19 jkh Exp $
# $Id: Makefile,v 1.262 1996/12/12 19:46:21 jkh Exp $
#
# How to roll a release:
#
@ -375,10 +375,10 @@ release.8: write_mfs_in_kernel dumpnlist
DIR=${RD}/mfsfd/stand ZIP=false
( cd ${RD}/trees/bin/dev && \
ls console tty ttyv0 ttyv1 ttyv2 ttyv3 null zero \
*[sw]d* cuaa[01] cuaa[23] fd[01] rfd[01] \
*[swo]d* cuaa[01] cuaa[23] fd[01] rfd[01] \
cd0a mcd0a scd0a matcd0a wcd0c rst0 rft0 rwt0 | \
cpio -dump ${RD}/mfsfd/dev )
( cd ${RD}/mfsfd/dev && rm -f *[sw]d*[bdefgh] )
( cd ${RD}/mfsfd/dev && rm -f *[swo]d*[bdefgh] )
cd ${RD}/trees/bin && ls ${BOOT1} | cpio -dump ${RD}/mfsfd/stand
echo "nameserver 42/tcp name" > ${RD}/mfsfd/stand/etc/services
echo "ftp 21/tcp" >> ${RD}/mfsfd/stand/etc/services
@ -445,10 +445,12 @@ ftp.1:
mkdir -p ${FD}
cd ${RD} && find floppies -print | cpio -dumpl ${FD}
cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
cp ${.CURDIR}/ABOUT.TXT ${FD}/ABOUT.TXT
cp ${.CURDIR}/sysinstall/help/readme.hlp ${FD}/README.TXT
cp ${.CURDIR}/sysinstall/help/hardware.hlp ${FD}/HARDWARE.TXT
cp ${.CURDIR}/sysinstall/help/install.hlp ${FD}/INSTALL.TXT
cp ${.CURDIR}/sysinstall/help/relnotes.hlp ${FD}/RELNOTES.TXT
cp ${.CURDIR}/floppies/README.TXT ${FD}/floppies/README.TXT
#
# --==## Setup a suitable cdrom-area ##==--