Index: user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh
===================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh	(revision 291272)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/10_test.sh	(revision 291273)
@@ -1,33 +1,32 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..1"
 
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 
 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 graid3 label -r $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 1"
 else
 	echo "ok 1"
 fi
 
-graid3 stop $name
 rm -f ${src} ${dst}
Index: user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh
===================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh	(revision 291272)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/11_test.sh	(revision 291273)
@@ -1,33 +1,32 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..1"
 
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 
 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 graid3 label -w $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 1"
 else
 	echo "ok 1"
 fi
 
-graid3 stop $name
 rm -f ${src} ${dst}
Index: user/ngie/more-tests2/sbin/geom/class/tests/raid3/12_test.sh
===================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/raid3/12_test.sh	(revision 291272)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/12_test.sh	(revision 291273)
@@ -1,40 +1,38 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..1"
 
 nblocks1=9
 nblocks2=`expr $nblocks1 - 1`
 nblocks3=`expr $nblocks2 / 2`
 
 us0=$(attach_md -t malloc -s $nblocks1) || exit 1
 us1=$(attach_md -t malloc -s $nblocks1) || exit 1
 us2=$(attach_md -t malloc -s $nblocks1) || exit 1
 
 dd if=/dev/random of=/dev/${us0} count=$nblocks1 >/dev/null 2>&1
 dd if=/dev/random of=/dev/${us1} count=$nblocks1 >/dev/null 2>&1
 dd if=/dev/random of=/dev/${us2} count=$nblocks1 >/dev/null 2>&1
 
 graid3 label -w $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 # Wait for synchronization.
 sleep 2
 graid3 stop $name
 # Break one component.
 dd if=/dev/random of=/dev/${us1} count=$nblocks2 >/dev/null 2>&1
 # Provoke retaste of the rest components.
 true > /dev/${us0}
 true > /dev/${us2}
 sleep 1
 
 dd if=/dev/raid3/${name} of=/dev/null bs=1k count=$nblocks3 >/dev/null 2>&1
 ec=$?
 if [ $ec -eq 0 ]; then
 	echo "not ok 1"
 else
 	echo "ok 1"
 fi
-
-graid3 stop $name
Index: user/ngie/more-tests2/sbin/geom/class/tests/raid3/1_test.sh
===================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/raid3/1_test.sh	(revision 291272)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/1_test.sh	(revision 291273)
@@ -1,30 +1,28 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..2"
 
 us0=$(attach_md -t malloc -s 1M) || exit 1
 us1=$(attach_md -t malloc -s 2M) || exit 1
 us2=$(attach_md -t malloc -s 3M) || exit 1
 
 graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} 2>/dev/null || exit 1
 devwait
 
 # Size of created device should be 2MB - 1024B.
 
 mediasize=`diskinfo /dev/raid3/${name} | awk '{print $3}'`
 if [ $mediasize -eq 2096128 ]; then
 	echo "ok 1"
 else
 	echo "not ok 1"
 fi
 sectorsize=`diskinfo /dev/raid3/${name} | awk '{print $2}'`
 if [ $sectorsize -eq 1024 ]; then
 	echo "ok 2"
 else
 	echo "not ok 2"
 fi
-
-graid3 stop $name
Index: user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh
===================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh	(revision 291272)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/2_test.sh	(revision 291273)
@@ -1,33 +1,32 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..1"
 
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 
 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 1"
 else
 	echo "ok 1"
 fi
 
-graid3 stop $name
 rm -f ${src} ${dst}
Index: user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh
===================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh	(revision 291272)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/3_test.sh	(revision 291273)
@@ -1,37 +1,36 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..1"
 
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 
 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 #
 # Reading without one DATA component (so with parity).
 #
 graid3 remove -n 1 $name
 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 1"
 else
 	echo "ok 1"
 fi
 
-graid3 stop $name
 rm -f ${src} ${dst}
Index: user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh
===================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh	(revision 291272)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/4_test.sh	(revision 291273)
@@ -1,37 +1,36 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..1"
 
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 
 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 #
 # Writing without one DATA component.
 #
 graid3 remove -n 1 $name
 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 1"
 else
 	echo "ok 1"
 fi
 
-graid3 stop $name
 rm -f ${src} ${dst}
Index: user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh
===================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh	(revision 291272)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/5_test.sh	(revision 291273)
@@ -1,37 +1,36 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..1"
 
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 
 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 #
 # Writing without PARITY component.
 #
 graid3 remove -n 2 $name
 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 1"
 else
 	echo "ok 1"
 fi
 
-graid3 stop $name
 rm -f ${src} ${dst}
Index: user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh
===================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh	(revision 291272)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/6_test.sh	(revision 291273)
@@ -1,41 +1,40 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..1"
 
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 
 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 #
 # Rebuild of DATA component.
 #
 graid3 remove -n 1 $name
 dd if=/dev/zero of=/dev/${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1
 graid3 insert -n 1 $name md${us1}
 sleep 1
 
 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 1"
 else
 	echo "ok 1"
 fi
 
-graid3 stop $name
 rm -f ${src} ${dst}
Index: user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh
===================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh	(revision 291272)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/7_test.sh	(revision 291273)
@@ -1,44 +1,43 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..1"
 
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 
 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 #
 # Rebuild of PARITY component.
 #
 graid3 remove -n 2 $name
 dd if=/dev/zero of=/dev/${us2} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1
 graid3 insert -n 2 $name md${us2}
 sleep 1
 # Remove DATA component, so PARITY component can be used while reading.
 graid3 remove -n 1 $name
 dd if=/dev/zero of=/dev/${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1
 
 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 1"
 else
 	echo "ok 1"
 fi
 
-graid3 stop $name
 rm -f ${src} ${dst}
Index: user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh
===================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh	(revision 291272)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/8_test.sh	(revision 291273)
@@ -1,40 +1,39 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..1"
 
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 
 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 #
 # Writing without DATA component and rebuild of DATA component.
 #
 graid3 remove -n 1 $name
 dd if=/dev/zero of=/dev/${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1
 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 graid3 insert -n 1 $name md${us1}
 sleep 1
 
 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 1"
 else
 	echo "ok 1"
 fi
 
-graid3 stop $name
 rm -f ${src} ${dst}
Index: user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh
===================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh	(revision 291272)
+++ user/ngie/more-tests2/sbin/geom/class/tests/raid3/9_test.sh	(revision 291273)
@@ -1,43 +1,42 @@
 #!/bin/sh
 # $FreeBSD$
 
 . `dirname $0`/conf.sh
 
 echo "1..1"
 
 ddbs=2048
 nblocks1=1024
 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 dst=`mktemp $TMPDIR/$base.XXXXXX` || exit 1
 
 us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1
 
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1
 devwait
 
 #
 # Writing without PARITY component and rebuild of PARITY component.
 #
 graid3 remove -n 2 $name
 dd if=/dev/zero of=/dev/${us2} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1
 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 graid3 insert -n 2 $name md${us2}
 sleep 1
 # Remove DATA component, so PARITY component can be used while reading.
 graid3 remove -n 1 $name
 dd if=/dev/zero of=/dev/${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1
 
 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then
 	echo "not ok 1"
 else
 	echo "ok 1"
 fi
 
-graid3 stop $name
 rm -f ${src} ${dst}