diff options
author | Poul-Henning Kamp <phk@FreeBSD.org> | 2001-01-31 22:58:39 +0000 |
---|---|---|
committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2001-01-31 22:58:39 +0000 |
commit | 2caebfe61a7d0d4d83cd5ec45ed735bad9955d0b (patch) | |
tree | 0850cc4a8eda28f2cbe14c60dc20d82a92bb8118 /release | |
parent | ed2b5a23687df7fc9614e1ef7de925ccfb93ed6c (diff) | |
download | src-2caebfe61a7d0d4d83cd5ec45ed735bad9955d0b.tar.gz src-2caebfe61a7d0d4d83cd5ec45ed735bad9955d0b.zip |
Use mdconfig/md instead of vn.
Notes
Notes:
svn path=/head/; revision=71887
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/doFS.sh | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh index 7b285629cc2e..14a0ff07bb5e 100644 --- a/release/scripts/doFS.sh +++ b/release/scripts/doFS.sh @@ -1,9 +1,9 @@ -: -#set -ex +#!/bin/sh +# +# $FreeBSD$ +# +set -e -if [ "x$VNDEVICE" = "x" ] ; then - VNDEVICE=vn0 -fi export BLOCKSIZE=512 if [ "$1" = "-s" ]; then @@ -22,33 +22,35 @@ FSLABEL=$1 ; shift 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/vnn${u}c c 43 `expr 2 + $u '*' 8` -VNDEVICE=vnn$u - while true do rm -f ${FSIMG} - umount /dev/${VNDEVICE} 2>/dev/null || true - - umount ${MNT} 2>/dev/null || true - - vnconfig -u /dev/${VNDEVICE} 2>/dev/null || true + if [ "x${MDDEVICE}" != "x" ] ; then + umount /dev/${MDDEVICE} 2>/dev/null || true + umount ${MNT} 2>/dev/null || true + mdconfig -d -u ${MDDEVICE} 2>/dev/null || true + fi 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/${VNDEVICE} ${FSIMG} - disklabel -Brw /dev/${VNDEVICE} ${FSLABEL} - newfs -i ${FSINODE} -T ${FSLABEL} -o space /dev/${VNDEVICE}c - tunefs -m 0 /dev/${VNDEVICE}c + MDDEVICE=`mdconfig -a -t vnode -f ${FSIMG}` + if [ ! -c /dev/${MDDEVICE} ] ; then + if [ -f /dev/MAKEDEV ] ; then + ( cd /dev && sh MAKEDEV ${MDDEVICE} ) + else + echo "No /dev/$MDDEVICE and no MAKEDEV" 1>&2 + exit 1 + fi + fi + disklabel -Brw /dev/${MDDEVICE} ${FSLABEL} + newfs -i ${FSINODE} -T ${FSLABEL} -o space /dev/${MDDEVICE}c + tunefs -m 0 /dev/${MDDEVICE}c - mount /dev/${VNDEVICE}c ${MNT} + mount /dev/${MDDEVICE}c ${MNT} if [ -d ${FSPROTO} ]; then (set -e && cd ${FSPROTO} && find . -print | cpio -dump ${MNT}) @@ -61,7 +63,7 @@ do set `df -ki ${MNT} | tail -1` umount ${MNT} - vnconfig -u /dev/${VNDEVICE} 2>/dev/null || true + mdconfig -d -u ${MDDEVICE} 2>/dev/null || true echo "*** Filesystem is ${FSSIZE} K, $4 left" echo "*** ${FSINODE} bytes/inode, $7 left" @@ -70,4 +72,3 @@ do fi break; done -rm -f /dev/*vnn* |