Index: user/pho/stress2/misc/devfs.sh
===================================================================
--- user/pho/stress2/misc/devfs.sh	(revision 279770)
+++ user/pho/stress2/misc/devfs.sh	(revision 279771)
@@ -1,70 +1,73 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2008 Peter Holm <pho@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
-mounts=10	# Number of parallel scripts
-D=/usr/tmp/diskimage
+mounts=15	# Number of parallel scripts
+cont=/tmp/devfs.continue
 
 if [ $# -eq 0 ]; then
+	touch $cont
 	for i in `jot $mounts`; do
 		[ ! -d ${mntpoint}$i ] && mkdir ${mntpoint}$i
-		mount | grep -q "${mntpoint}$i" && umount ${mntpoint}$i
+		mount | grep -q "on ${mntpoint}$i " && umount ${mntpoint}$i
 	done
 
 	# start the parallel tests
 	for i in `jot $mounts`; do
 		./$0 $i &
 		./$0 find &
 	done
 
 	for i in `jot $mounts`; do
 		wait; wait
 	done
 else
 	if [ $1 = find ]; then
-		for i in `jot 64`; do
+		while [ -r $cont ]; do
 			find ${mntpoint}* -maxdepth 1 -type f > /dev/null 2>&1
 		done
 	else
 
 		# The test: Parallel mount and unmounts
-		for i in `jot 64`; do
+		start=`date '+%s'`
+		while [ `date '+%s'` -lt $((start + 300)) ]; do
 			m=$1
 			mount -t devfs none ${mntpoint}$m
 			opt=`[ $(( m % 2 )) -eq 0 ] && echo -f`
-			while mount | grep -q ${mntpoint}$m; do
+			while mount | grep -q " ${mntpoint}$m "; do
 				umount $opt ${mntpoint}$m > /dev/null 2>&1
 			done
 		done
+		rm -f $cont
 	fi
 fi
Index: user/pho/stress2/misc/nullfs.sh
===================================================================
--- user/pho/stress2/misc/nullfs.sh	(revision 279770)
+++ user/pho/stress2/misc/nullfs.sh	(revision 279771)
@@ -1,70 +1,74 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2008 Peter Holm <pho@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 # Stress test by performing parallel calls to mount and umount. Alternate
 # between forced and non-forced unmounts
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
 . ../default.cfg
 
 mounts=15	# Number of parallel scripts
+cont=/tmp/nullfs.continue
 
 if [ $# -eq 0 ]; then
+	touch $cont
 	for i in `jot $mounts`; do
 		[ ! -d ${mntpoint}$i ] && mkdir ${mntpoint}$i
-		mount | grep "$mntpoint" | grep -q ${mntpoint}$i && umount ${mntpoint}$i
+		mount | grep -q " ${mntpoint}$i " && umount ${mntpoint}$i
 	done
 
 	# start the parallel tests
 	for i in `jot $mounts`; do
 		./$0 $i &
 	done
 
 
 	for i in `jot $mounts`; do
 		wait
 	done
 
 	for i in `jot $mounts`; do
 		umount ${mntpoint}$i > /dev/null 2>&1
 	done
 
 else
 	# The test: Parallel mount and unmounts
-	for i in `jot 1024`; do
+	start=`date '+%s'`
+	while [ `date '+%s'` -lt $((start + 300)) ]; do
 		m=$1
 		mount_nullfs /tmp ${mntpoint}$m > /dev/null 2>&1
 		opt=`[ $(( m % 2 )) -eq 0 ] && echo -f`
 		while mount | grep "$mntpoint" | grep -q ${mntpoint}$m; do
-                   umount $opt ${mntpoint}$m > /dev/null 2>&1
+			umount $opt ${mntpoint}$m > /dev/null 2>&1
 		done
 	done
+	rm -f $cont
 fi