Using `r'aw device name is out of vogue now.

1 files changed, 6 insertions, 8 deletions

diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh
index fb43aaf..7b28562 100644
--- a/release/scripts/doFS.sh
+++ b/release/scripts/doFS.sh
@@ -25,9 +25,7 @@ deadlock=20
 u=`expr $VNDEVICE : 'vn\([0-9]*\)' || true`
 rm -f /dev/*vnn*
 mknod /dev/vnn${u} c 43 `expr 65538 + $u '*' 8`
-mknod /dev/rvnn${u} c 43 `expr 65538 + $u '*' 8`
 mknod /dev/vnn${u}c c 43 `expr 2 + $u '*' 8`
-mknod /dev/rvnn${u}c c 43 `expr 2 + $u '*' 8`
 VNDEVICE=vnn$u
 
 while true 
@@ -38,17 +36,17 @@ do
 
 	umount ${MNT} 2>/dev/null || true
 
-	vnconfig -u /dev/r${VNDEVICE} 2>/dev/null || true
+	vnconfig -u /dev/${VNDEVICE} 2>/dev/null || true
 
 	dd of=${FSIMG} if=/dev/zero count=${FSSIZE} bs=1k 2>/dev/null
 	# this suppresses the `invalid primary partition table: no magic'
 	awk 'BEGIN {printf "%c%c", 85, 170}' |\
 	    dd of=${FSIMG} obs=1 seek=510 conv=notrunc 2>/dev/null
 
-	vnconfig -s labels -c /dev/r${VNDEVICE} ${FSIMG}
-	disklabel -Brw /dev/r${VNDEVICE} ${FSLABEL}
-	newfs -i ${FSINODE} -T ${FSLABEL} -o space /dev/r${VNDEVICE}c
-	tunefs -m 0 /dev/r${VNDEVICE}c
+	vnconfig -s labels -c /dev/${VNDEVICE} ${FSIMG}
+	disklabel -Brw /dev/${VNDEVICE} ${FSLABEL}
+	newfs -i ${FSINODE} -T ${FSLABEL} -o space /dev/${VNDEVICE}c
+	tunefs -m 0 /dev/${VNDEVICE}c
 
 	mount /dev/${VNDEVICE}c ${MNT}
 
@@ -63,7 +61,7 @@ do
 	set `df -ki ${MNT} | tail -1`
 
 	umount ${MNT}
-	vnconfig -u /dev/r${VNDEVICE} 2>/dev/null || true
+	vnconfig -u /dev/${VNDEVICE} 2>/dev/null || true
 
 	echo "*** Filesystem is ${FSSIZE} K, $4 left"
 	echo "***     ${FSINODE} bytes/inode, $7 left"