Some release changes I've had to make in dealing with the floppy space

crisis.
This commit is contained in:
Jordan K. Hubbard 1996-07-09 16:52:53 +00:00
parent 5c17ec631e
commit ae33fac50c
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=17041
3 changed files with 74 additions and 67 deletions

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.229 1996/07/05 21:48:49 jkh Exp $
# $Id: Makefile,v 1.193.2.55 1996/07/09 11:25:10 jkh Exp $
#
# How to roll a release:
#
@ -40,9 +40,9 @@ FDLABEL= fd1200
ZIPNSPLIT= gzip --no-name -9 -c | split -b 240640 -
# Upper size for the mfs in the boot.flp kernel.
# These are adjusted down to the minimum needed but doFS.sh.
# These are adjusted down to the minimum needed by doFS.sh.
BOOTMFSSIZE= 1200
MFSINODE= 65536
MFSINODE= 42000
# Things which will get you into trouble if you change them
DISTRIBUTIONS= bin ${EXTRA_DISTS}
@ -367,9 +367,9 @@ release.8: write_mfs_in_kernel
gzip -c ${.CURDIR}/../COPYRIGHT > ${RD}/mfsfd/stand/help/COPYRIGHT.hlp.gz
# make the small bootfd
@echo "Making the small 4MB boot floppy."
sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} ${RD}/mfsfd \
${MFSINODE} minimum
mv fs-image fs-image.4
sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} ${RD}/mfsfd \
${MFSINODE} minimum
mv fs-image fs-image.4
mv fs-image.size fs-image.4.size
# add more stuff for the complete bootfd
@echo "Making the regular boot floppy."
@ -412,8 +412,7 @@ release.9:
# --==## Setup a suitable ftp-area ##==--
#
ftp.1:
rm -rf ${FD}
mkdir ${FD}
mkdir -p ${FD}
cd ${RD} && find floppies -print | cpio -dumpl ${FD}
cd ${RD}/dists && find . -print | cpio -dumpl ${FD}
cp ${.CURDIR}/sysinstall/help/readme.hlp ${FD}/README.TXT
@ -425,9 +424,7 @@ ftp.1:
# --==## Setup a suitable cdrom-area ##==--
#
cdrom.1:
rm -rf ${CD}
mkdir ${CD}
mkdir ${CD}/filesys
mkdir -p ${CD}/filesys
cd ${RD} && find floppies dists -print | cpio -dumpl ${CD}
ln -f ${RD}/kernels/MFSKERNEL.std ${CD}/kernel
ln -f ${RD}/trees/bin/usr/mdec/fbsdboot.exe ${CD}

View File

@ -52,7 +52,7 @@ do
-s ${RD}/trees/bin/usr/mdec/bootfd \
/dev/r${VNDEVICE} minimum
newfs -u 0 -t 0 -i ${FSINODE} -m 0 -T minimum /dev/r${VNDEVICE}a
newfs -u 0 -t 0 -i ${FSINODE} -m 0 -T minimum -o space /dev/r${VNDEVICE}a
mount /dev/${VNDEVICE}a ${MNT}
@ -74,33 +74,38 @@ do
echo ">>> Filesystem is ${FSSIZE} K, $4 left"
echo ">>> ${FSINODE} bytes/inode, $7 left"
echo ">>> `expr ${FSSIZE} \* 1024 / ${FSINODE}`"
if [ $4 -gt 128 ] ; then
echo "Reducing size"
FSSIZE=`expr ${FSSIZE} - $4 / 2`
continue
fi
if [ $7 -gt 128 ] ; then
echo "Increasing bytes per inode"
FSINODE=`expr ${FSINODE} + 8192`
continue
fi
if [ $4 -gt 32 ] ; then
echo "Reducing size"
FSSIZE=`expr ${FSSIZE} - 4`
FSINODE=`expr ${FSINODE} - 1024`
continue
fi
if [ $7 -gt 64 ] ; then
echo "Increasing bytes per inode"
FSINODE=`expr ${FSINODE} + 8192`
continue
fi
if [ $deadlock -eq 0 ] ; then
echo "Avoiding deadlock, giving up"
echo ${FSSIZE} > fs-image.size
break
fi
deadlock=`expr $deadlock - 1`
# As far as I can tell, the following has only really caused me great
# difficulty..
#
# if [ $4 -gt 128 ] ; then
# echo "Reducing size"
# FSSIZE=`expr ${FSSIZE} - $4 / 2`
# continue
# fi
# if [ $7 -gt 128 ] ; then
# echo "Increasing bytes per inode"
# FSINODE=`expr ${FSINODE} + 8192`
# continue
# fi
# if [ $4 -gt 32 ] ; then
# echo "Reducing size"
# FSSIZE=`expr ${FSSIZE} - 4`
# FSINODE=`expr ${FSINODE} - 1024`
# continue
# fi
# if [ $7 -gt 64 ] ; then
# echo "Increasing bytes per inode"
# FSINODE=`expr ${FSINODE} + 8192`
# continue
# fi
# if [ $deadlock -eq 0 ] ; then
# echo "Avoiding deadlock, giving up"
# echo ${FSSIZE} > fs-image.size
# break
# fi
# deadlock=`expr $deadlock - 1`
echo ${FSSIZE} > fs-image.size
break;
done

View File

@ -52,7 +52,7 @@ do
-s ${RD}/trees/bin/usr/mdec/bootfd \
/dev/r${VNDEVICE} minimum
newfs -u 0 -t 0 -i ${FSINODE} -m 0 -T minimum /dev/r${VNDEVICE}a
newfs -u 0 -t 0 -i ${FSINODE} -m 0 -T minimum -o space /dev/r${VNDEVICE}a
mount /dev/${VNDEVICE}a ${MNT}
@ -74,33 +74,38 @@ do
echo ">>> Filesystem is ${FSSIZE} K, $4 left"
echo ">>> ${FSINODE} bytes/inode, $7 left"
echo ">>> `expr ${FSSIZE} \* 1024 / ${FSINODE}`"
if [ $4 -gt 128 ] ; then
echo "Reducing size"
FSSIZE=`expr ${FSSIZE} - $4 / 2`
continue
fi
if [ $7 -gt 128 ] ; then
echo "Increasing bytes per inode"
FSINODE=`expr ${FSINODE} + 8192`
continue
fi
if [ $4 -gt 32 ] ; then
echo "Reducing size"
FSSIZE=`expr ${FSSIZE} - 4`
FSINODE=`expr ${FSINODE} - 1024`
continue
fi
if [ $7 -gt 64 ] ; then
echo "Increasing bytes per inode"
FSINODE=`expr ${FSINODE} + 8192`
continue
fi
if [ $deadlock -eq 0 ] ; then
echo "Avoiding deadlock, giving up"
echo ${FSSIZE} > fs-image.size
break
fi
deadlock=`expr $deadlock - 1`
# As far as I can tell, the following has only really caused me great
# difficulty..
#
# if [ $4 -gt 128 ] ; then
# echo "Reducing size"
# FSSIZE=`expr ${FSSIZE} - $4 / 2`
# continue
# fi
# if [ $7 -gt 128 ] ; then
# echo "Increasing bytes per inode"
# FSINODE=`expr ${FSINODE} + 8192`
# continue
# fi
# if [ $4 -gt 32 ] ; then
# echo "Reducing size"
# FSSIZE=`expr ${FSSIZE} - 4`
# FSINODE=`expr ${FSINODE} - 1024`
# continue
# fi
# if [ $7 -gt 64 ] ; then
# echo "Increasing bytes per inode"
# FSINODE=`expr ${FSINODE} + 8192`
# continue
# fi
# if [ $deadlock -eq 0 ] ; then
# echo "Avoiding deadlock, giving up"
# echo ${FSSIZE} > fs-image.size
# break
# fi
# deadlock=`expr $deadlock - 1`
echo ${FSSIZE} > fs-image.size
break;
done