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

[Peter Holm]

Author: pho
Date: Fri Sep  9 08:53:04 2016
New Revision: 305656
URL: https://svnweb.freebsd.org/changeset/base/305656

Log:
  Added missing mdconfig(8) cleanup.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/sendfile5.sh
  user/pho/stress2/misc/setuid.sh

Modified: user/pho/stress2/misc/sendfile5.sh
==============================================================================
--- user/pho/stress2/misc/sendfile5.sh	Fri Sep  9 08:51:02 2016	(r305655)
+++ user/pho/stress2/misc/sendfile5.sh	Fri Sep  9 08:53:04 2016	(r305656)
@@ -54,7 +54,6 @@ cp $diskimage $mntpoint
 /tmp/sendfile5 $mntpoint/$file
 umount $mntpoint
 
-mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 mdconfig -a -t swap -s 2g -u $mdstart || exit 1
 bsdlabel -w md$mdstart auto
 newfs $newfs_flags md${mdstart}$part > /dev/null
@@ -63,6 +62,7 @@ echo "Testing FFS"
 cp $diskimage $mntpoint
 /tmp/sendfile5 $mntpoint/$file
 umount $mntpoint
+mdconfig -d -u $mdstart
 
 mount -t nullfs $dir $mntpoint
 echo "Testing nullfs(5)"

Modified: user/pho/stress2/misc/setuid.sh
==============================================================================
--- user/pho/stress2/misc/setuid.sh	Fri Sep  9 08:51:02 2016	(r305655)
+++ user/pho/stress2/misc/setuid.sh	Fri Sep  9 08:53:04 2016	(r305656)
@@ -74,6 +74,7 @@ echo "Expect Abort trap"
 while mount | grep "on $mntpoint " | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
+mdconfig -d -u $mdstart
 rm -f /tmp/setuid /tmp/nop
 exit
 EOF