From owner-svn-src-user@FreeBSD.ORG  Fri Dec  6 11:28:36 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5CEE17E1;
 Fri,  6 Dec 2013 11:28:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 300981374;
 Fri,  6 Dec 2013 11:28:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB6BSafn028576;
 Fri, 6 Dec 2013 11:28:36 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB6BSZ80028572;
 Fri, 6 Dec 2013 11:28:35 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201312061128.rB6BSZ80028572@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Fri, 6 Dec 2013 11:28:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r259025 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Dec 2013 11:28:36 -0000

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