summaryrefslogtreecommitdiff
path: root/regress/sbin/newfs/checknewfs
diff options
context:
space:
mode:
authorThordur I. Bjornsson <thib@cvs.openbsd.org>2011-04-18 16:52:13 +0000
committerThordur I. Bjornsson <thib@cvs.openbsd.org>2011-04-18 16:52:13 +0000
commit4514e243d14cd40603dffb605323e3402ec21b23 (patch)
treed4b13011d6019799589fc50473b797e4aa5e0b3d /regress/sbin/newfs/checknewfs
parentaf2f7b02e557188dfe5a424132f1b18dcd36c6fd (diff)
Deprecate vnds in favour of svnds.
In effect, this removes the "old" vndX nodes, and renames the svndX nodes to vndX. Old svndX nodes will still continue to work though, for now. Cleanup accordingly. ok deraadt@, todd@ comments and ok on the man page bits from jmc@
Diffstat (limited to 'regress/sbin/newfs/checknewfs')
-rw-r--r--regress/sbin/newfs/checknewfs14
1 files changed, 7 insertions, 7 deletions
diff --git a/regress/sbin/newfs/checknewfs b/regress/sbin/newfs/checknewfs
index a64d72d83f3..c659905c156 100644
--- a/regress/sbin/newfs/checknewfs
+++ b/regress/sbin/newfs/checknewfs
@@ -1,10 +1,10 @@
#!/bin/ksh
-# $OpenBSD: checknewfs,v 1.3 2009/04/26 21:32:31 okan Exp $
+# $OpenBSD: checknewfs,v 1.4 2011/04/18 16:52:11 thib Exp $
# Written by Otto Moerbeek, 2007, Public domain
cleanup() {
- vnconfig -u svnd0
+ vnconfig -u vnd0
rm -f $image
}
@@ -13,14 +13,14 @@ trap 'cleanup' INT
dotest() {
image=$(mktemp -t imageXXXXXXXXXX);
dd if=/dev/prandom of=$image bs=512 count=$1 2>/dev/null &&
- vnconfig svnd0 $image &&
- disklabel -w svnd0 $2 &&
- newfs $3 /dev/rsvnd0a
+ vnconfig vnd0 $image &&
+ disklabel -w vnd0 $2 &&
+ newfs $3 /dev/rvnd0a
if [ $? != 0 ]; then
ret=$(($ret + 1))
echo TEST $1 $2 \"$3\" failed
else
- (fsck -nf /dev/svnd0a | fgrep SALVAGE)
+ (fsck -nf /dev/vnd0a | fgrep SALVAGE)
if [ $? == 0 ]; then
ret=$(($ret + 1))
echo TEST $1 $2 \"$3\" failed
@@ -36,7 +36,7 @@ dotest() {
ret=0
-vnconfig -u svnd0 > /dev/null 2>&1
+vnconfig -u vnd0 > /dev/null 2>&1
if [ $# == 0 ]; then
clean=1
dotest 3800 rdroot "-m 0 -o space -i 4096"