I belive this works now.

3 files changed, 40 insertions, 45 deletions

diff --git a/release/Makefile b/release/Makefile
index efe79bd..c5da97f 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.202 1996/01/11 20:28:40 phk Exp $
+#	$Id: Makefile,v 1.203 1996/01/13 23:31:44 phk Exp $
 #
 # How to roll a release:
 #
@@ -12,7 +12,7 @@
 #
 # SET THIS !!!
 BUILDNAME=2.2-current
-# CHROOTDIR=/a/r2
+# CHROOTDIR=/a/r1
 # If this is a RELEASE, then set
 #RELEASETAG=RELENG_2_1_0
 
@@ -113,7 +113,6 @@ rerelease release:
 	echo "rm -f obj/release.4"		>> ${CHROOTDIR}/mk
 	echo "make doRELEASE"			>> ${CHROOTDIR}/mk
 	echo "echo make ${.TARGET} Finished"	>> ${CHROOTDIR}/mk
-	cp ${.CURDIR}/Makefile ${CHROOTDIR}/usr/src/release
 	chmod 755 ${CHROOTDIR}/mk
 	chroot ${CHROOTDIR} /mk
 
@@ -349,22 +348,22 @@ release.8: write_mfs_in_kernel
 	echo "domain          53/udp          nameserver" >> ${RD}/mfsfd/stand/etc/services
 	install -c ${.CURDIR}/../COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp
 	# make the small bootfd
-	sh ${.CURDIR}/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} ${RD}/mfsfd \
+	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
 	tar --exclude CVS -cf - -C ${.CURDIR}/sysinstall help | \
 		tar xvf - -C ${RD}/mfsfd/stand
-	sh ${.CURDIR}/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} ${RD}/mfsfd \
+	sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} ${RD}/mfsfd \
 		${MFSINODE} minimum
 	mv fs-image fs-image.std
 	mv fs-image.size fs-image.std.size
-	rm -rf ${.CURDIR}/../sys/compile/BOOTMFS 
+	#rm -rf ${.CURDIR}/../sys/compile/BOOTMFS 
 	cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=4
 	cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=std
 	mv ${RD}/floppies/bootstd.flp ${RD}/floppies/boot.flp
-	rm -rf ${.CURDIR}/../sys/compile/BOOTMFS 
+	#rm -rf ${.CURDIR}/../sys/compile/BOOTMFS 
 	touch release.8
 
 #
@@ -406,8 +405,8 @@ release.10:
 		sh MAKEDEV all )
 	cp ${RD}/trees/bin/etc/spwd.db ${RD}/fixitfd/etc
 	cp ${.CURDIR}/fixit.profile ${RD}/fixitfd/.profile
-	sh ${.CURDIR}/doFS.sh ${RD} ${MNT} ${FDSIZE} ${RD}/fixitfd \
-		1024 ${FDLABEL}
+	sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${FDSIZE} ${RD}/fixitfd \
+		10000 ${FDLABEL}
 	mv fs-image ${RD}/floppies/fixit.flp
 	touch release.10
 
@@ -558,8 +557,8 @@ doMFSKERN:
 	mv ${RD}/boot.${FSIMAGE}/kernel.kz ${RD}/boot.${FSIMAGE}/kernel
 	ls -l ${RD}/boot.${FSIMAGE}/kernel
 	rm -f ${RD}/floppies/boot${FSIMAGE}.flp
-	sh ${.CURDIR}/doFS.sh ${RD} ${MNT} ${FDSIZE} ${RD}/boot.${FSIMAGE} \
-		${FDINODE} ${FDLABEL}
+	sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${FDSIZE} ${RD}/boot.${FSIMAGE} \
+		100000 ${FDLABEL}
 	mv fs-image ${RD}/floppies/boot${FSIMAGE}.flp
 
 .include <bsd.prog.mk>
diff --git a/release/doFS.sh b/release/doFS.sh
index 1c09de9..4280ca0 100644
--- a/release/doFS.sh
+++ b/release/doFS.sh
@@ -1,5 +1,5 @@
 :
-set -e
+set -ex
 
 VNDEVICE=vn0
 
@@ -28,27 +28,25 @@ do
 
 	vnconfig -s labels -c /dev/r${VNDEVICE} fs-image
 
-	if [ "$FSLABEL" = "minimum" ] ; then
-		sed '/^minimum:/,$d' /etc/disktab > /etc/disktab.tmp
-		cat /etc/disktab.tmp > /etc/disktab
-		rm -f /etc/disktab.tmp
-		(
-		a=`expr ${FSSIZE} \* 2`
-		echo 
-		echo "minimum:ty=mfs:se#512:nt#1:rm#300:\\"
-		echo "	:ns#$a:nc#1:\\"
-		echo "	:pa#$a:oa#0:ba#4096:fa#512:\\"
-		echo "	:pc#$a:oc#0:bc#4096:fc#512:"
-		echo
-		) >> /etc/disktab
-	fi
+	sed '/^minimum:/,$d' /etc/disktab > /etc/disktab.tmp
+	cat /etc/disktab.tmp > /etc/disktab
+	rm -f /etc/disktab.tmp
+	(
+	a=`expr ${FSSIZE} \* 2`
+	echo 
+	echo "minimum:ty=mfs:se#512:nt#1:rm#300:\\"
+	echo "	:ns#$a:nc#1:\\"
+	echo "	:pa#$a:oa#0:ba#4096:fa#512:\\"
+	echo "	:pc#$a:oc#0:bc#4096:fc#512:"
+	echo
+	) >> /etc/disktab
 
 	disklabel -w -r -B \
 		-b ${RD}/trees/bin/usr/mdec/fdboot \
 		-s ${RD}/trees/bin/usr/mdec/bootfd \
-		/dev/r${VNDEVICE} ${FSLABEL}
+		/dev/r${VNDEVICE} minimum
 
-	newfs -u 0 -c 8 -t 0 -i ${FSINODE} -m 0 -T ${FSLABEL} /dev/r${VNDEVICE}a
+	newfs -u 0 -c 8 -t 0 -i ${FSINODE} -m 0 -T minimum /dev/r${VNDEVICE}a
 
 	mount /dev/${VNDEVICE}a ${MNT}
 
diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh
index 1c09de9..4280ca0 100644
--- a/release/scripts/doFS.sh
+++ b/release/scripts/doFS.sh
@@ -1,5 +1,5 @@
 :
-set -e
+set -ex
 
 VNDEVICE=vn0
 
@@ -28,27 +28,25 @@ do
 
 	vnconfig -s labels -c /dev/r${VNDEVICE} fs-image
 
-	if [ "$FSLABEL" = "minimum" ] ; then
-		sed '/^minimum:/,$d' /etc/disktab > /etc/disktab.tmp
-		cat /etc/disktab.tmp > /etc/disktab
-		rm -f /etc/disktab.tmp
-		(
-		a=`expr ${FSSIZE} \* 2`
-		echo 
-		echo "minimum:ty=mfs:se#512:nt#1:rm#300:\\"
-		echo "	:ns#$a:nc#1:\\"
-		echo "	:pa#$a:oa#0:ba#4096:fa#512:\\"
-		echo "	:pc#$a:oc#0:bc#4096:fc#512:"
-		echo
-		) >> /etc/disktab
-	fi
+	sed '/^minimum:/,$d' /etc/disktab > /etc/disktab.tmp
+	cat /etc/disktab.tmp > /etc/disktab
+	rm -f /etc/disktab.tmp
+	(
+	a=`expr ${FSSIZE} \* 2`
+	echo 
+	echo "minimum:ty=mfs:se#512:nt#1:rm#300:\\"
+	echo "	:ns#$a:nc#1:\\"
+	echo "	:pa#$a:oa#0:ba#4096:fa#512:\\"
+	echo "	:pc#$a:oc#0:bc#4096:fc#512:"
+	echo
+	) >> /etc/disktab
 
 	disklabel -w -r -B \
 		-b ${RD}/trees/bin/usr/mdec/fdboot \
 		-s ${RD}/trees/bin/usr/mdec/bootfd \
-		/dev/r${VNDEVICE} ${FSLABEL}
+		/dev/r${VNDEVICE} minimum
 
-	newfs -u 0 -c 8 -t 0 -i ${FSINODE} -m 0 -T ${FSLABEL} /dev/r${VNDEVICE}a
+	newfs -u 0 -c 8 -t 0 -i ${FSINODE} -m 0 -T minimum /dev/r${VNDEVICE}a
 
 	mount /dev/${VNDEVICE}a ${MNT}