From 49e94fab072f6919ea1b120de2c7e79d92e87cfa Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Tue, 1 Oct 1996 12:13:29 +0000
Subject: Installation cleanup, round II.

---
 release/scripts/doFS.sh | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'release/scripts')

diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh
index 9841200..d7315c7 100644
--- a/release/scripts/doFS.sh
+++ b/release/scripts/doFS.sh
@@ -34,27 +34,15 @@ do
 
 	vnconfig -s labels -c /dev/r${VNDEVICE} fs-image
 
-	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 \
+	dd if=${RD}/trees/bin/usr/mdec/boot1 of=fs-image conv=notrunc
+	disklabel /dev/r${VNDEVICE} | disklabel -R -B \
 		-b ${RD}/trees/bin/usr/mdec/fdboot \
 		-s ${RD}/trees/bin/usr/mdec/bootfd \
-		/dev/r${VNDEVICE} minimum
+		/dev/r${VNDEVICE} /dev/stdin
 
-	newfs -u 0 -t 0 -i ${FSINODE} -m 0 -T minimum -o space /dev/r${VNDEVICE}a
+	newfs -u 0 -t 0 -i ${FSINODE} -m 0 -T minimum -o space /dev/r${VNDEVICE}c
 
-	mount /dev/${VNDEVICE}a ${MNT}
+	mount /dev/${VNDEVICE}c ${MNT}
 
 	( set -e && cd ${FSPROTO} && find . -print | cpio -dump ${MNT} )
 
@@ -62,7 +50,7 @@ do
 
 	umount ${MNT}
 
-	fsck -p /dev/r${VNDEVICE}a < /dev/null
+	fsck -p /dev/r${VNDEVICE}c < /dev/null
 
 	vnconfig -u /dev/r${VNDEVICE} 2>/dev/null || true
 
-- 
cgit v1.1