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

[Peter Holm]

Author: pho
Date: Fri Dec  6 11:28:35 2013
New Revision: 259025
URL: http://svnweb.freebsd.org/changeset/base/259025

Log:
  Make sure that mount_msdosfs is available and make msdos3 a bit more
  verbose.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/misc/msdos.sh
  user/pho/stress2/misc/msdos2.sh
  user/pho/stress2/misc/msdos3.sh
  user/pho/stress2/misc/msdos4.sh

Modified: user/pho/stress2/misc/msdos.sh
==============================================================================
--- user/pho/stress2/misc/msdos.sh	Fri Dec  6 09:22:31 2013	(r259024)
+++ user/pho/stress2/misc/msdos.sh	Fri Dec  6 11:28:35 2013	(r259025)
@@ -34,6 +34,7 @@
 
 . ../default.cfg
 
+[ -x /sbin/mount_msdosfs ] || exit
 mount | grep "$mntpoint" | grep -q md$mdstart && umount -f ${mntpoint}
 mdconfig -l | grep -q ${mdstart} &&  mdconfig -d -u $mdstart
 

Modified: user/pho/stress2/misc/msdos2.sh
==============================================================================
--- user/pho/stress2/misc/msdos2.sh	Fri Dec  6 09:22:31 2013	(r259024)
+++ user/pho/stress2/misc/msdos2.sh	Fri Dec  6 11:28:35 2013	(r259025)
@@ -36,6 +36,7 @@
 
 . ../default.cfg
 
+[ -x /sbin/mount_msdosfs ] || exit
 mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint
 mdconfig -l | grep -q $mdstart &&  mdconfig -d -u $mdstart
 

Modified: user/pho/stress2/misc/msdos3.sh
==============================================================================
--- user/pho/stress2/misc/msdos3.sh	Fri Dec  6 09:22:31 2013	(r259024)
+++ user/pho/stress2/misc/msdos3.sh	Fri Dec  6 11:28:35 2013	(r259025)
@@ -36,6 +36,7 @@
 
 . ../default.cfg
 
+[ -x /sbin/mount_msdosfs ] || exit
 mount | grep "$mntpoint" | grep -q md$mdstart && umount -f $mntpoint
 mdconfig -l | grep -q $mdstart &&  mdconfig -d -u $mdstart
 
@@ -44,7 +45,7 @@ bsdlabel -w md${mdstart} auto
 newfs_msdos /dev/md${mdstart}a > /dev/null
 
 mount -t msdosfs /dev/md${mdstart}a $mntpoint
-mount -t msdosfs /dev/md${mdstart}a $mntpoint
+mount -t msdosfs /dev/md${mdstart}a $mntpoint || echo OK
 
 ls $mntpoint > /dev/null
 

Modified: user/pho/stress2/misc/msdos4.sh
==============================================================================
--- user/pho/stress2/misc/msdos4.sh	Fri Dec  6 09:22:31 2013	(r259024)
+++ user/pho/stress2/misc/msdos4.sh	Fri Dec  6 11:28:35 2013	(r259025)
@@ -34,6 +34,7 @@
 
 . ../default.cfg
 
+[ -x /sbin/mount_msdosfs ] || exit
 mount | grep "$mntpoint" | grep -q md$mdstart && umount -f ${mntpoint}
 mdconfig -l | grep -q ${mdstart} &&  mdconfig -d -u $mdstart