From 4b351aa8eba14358493845cce5a85905e3a211e3 Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Sun, 14 Jan 1996 19:10:16 +0000
Subject: I belive this works now.

---
 release/scripts/doFS.sh | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

(limited to 'release/scripts')

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}
 
-- 
cgit v1.1