4 files changed, 44 insertions, 42 deletions

diff --git a/release/Makefile b/release/Makefile
index 074df28895bf..07f126483bf1 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.193.2.54 1996/07/06 02:10:06 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}
diff --git a/release/doFS.sh b/release/doFS.sh
index 4d58e4611cf4..984120072cf8 100644
--- a/release/doFS.sh
+++ b/release/doFS.sh
@@ -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
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 6b463a4345a5..e91d7177beb3 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.62 1996/07/09 14:28:12 jkh Exp $
+ * $Id: dist.c,v 1.36.2.35 1996/07/09 14:36:49 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -461,7 +461,7 @@ distExtract(char *parent, Distribution *me)
 		seconds = stop.tv_sec + (stop.tv_usec / 1000000.0);
 		if (!seconds)
 		    seconds = 1;
-		msgInfo("%d bytes read from %s distribution, chunk %d of %d @ %.1f KBytes/second",
+		msgInfo("%d bytes read from %s dist, chunk %d of %d @ %-4.1f KB/sec.",
 			total, dist, chunk + 1, numchunks, (chunktotal / seconds) / 1024.0);
 		retval = write(fd2, buf, n);
 		if (retval != n) {
diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h
index 5c1fce131ff1..b2b4ebbda227 100644
--- a/release/sysinstall/dist.h
+++ b/release/sysinstall/dist.h
@@ -24,7 +24,7 @@
 	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC)
 
 #define _DIST_USER \
-	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20 | DIST_COMPAT21)
+	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT)
 
 #define _DIST_XDEV \
 	(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS)