svn commit: r332668 - user/pho/stress2/misc

[Peter Holm]

Author: pho
Date: Wed Apr 18 11:31:16 2018
New Revision: 332668
URL: https://svnweb.freebsd.org/changeset/base/332668

Log:
  Added missing umount(8) and style fixes.

Modified:
  user/pho/stress2/misc/crossmp8.sh

Modified: user/pho/stress2/misc/crossmp8.sh
==============================================================================
--- user/pho/stress2/misc/crossmp8.sh	Wed Apr 18 11:28:16 2018	(r332667)
+++ user/pho/stress2/misc/crossmp8.sh	Wed Apr 18 11:31:16 2018	(r332668)
@@ -58,7 +58,8 @@ if [ $# -eq 0 ]; then
 		m=$((i + mdstart - 1))
 		[ ! -d ${mntpoint}$m ] &&
 		    { mkdir ${mntpoint}$m;  chmod 755 ${mntpoint}$m; }
-		mount | grep "${mntpoint}$m" | grep -q md$m && umount ${mntpoint}$m
+		mount | grep "${mntpoint}$m " | grep -q md$m &&
+		    umount ${mntpoint}$m
 		mdconfig -l | grep -q md$m && mdconfig -d -u $m
 
 		mdconfig -a -t swap -s ${size}m -u $m
@@ -80,10 +81,14 @@ if [ $# -eq 0 ]; then
 
 	for i in `jot $mounts`; do
 		m=$((i + mdstart - 1))
+		while mount | grep -q "on ${mntpoint}$m "; do
+		    umount ${mntpoint}$m && break
+		    sleep 1
+		done
 		mdconfig -d -u $m
 	done
 	./cleanup.sh
-
+	exit 0
 else
 	if [ $1 = find ]; then
 		while [ -f $CONT ]; do