From owner-svn-src-user@FreeBSD.ORG  Fri Dec  6 12:34:15 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5CC4C27D;
 Fri,  6 Dec 2013 12:34:15 +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 49AD91834;
 Fri,  6 Dec 2013 12:34:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB6CYFx9052303;
 Fri, 6 Dec 2013 12:34:15 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB6CYFx9052302;
 Fri, 6 Dec 2013 12:34:15 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201312061234.rB6CYFx9052302@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Fri, 6 Dec 2013 12:34:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r259027 - 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 12:34:15 -0000

Author: pho
Date: Fri Dec  6 12:34:14 2013
New Revision: 259027
URL: http://svnweb.freebsd.org/changeset/base/259027

Log:
  Added check for mount_msdosfs installed.
  
  Sponsored by:	EMC / Isilon storage division

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

Modified: user/pho/stress2/misc/mountu.sh
==============================================================================
--- user/pho/stress2/misc/mountu.sh	Fri Dec  6 11:30:30 2013	(r259026)
+++ user/pho/stress2/misc/mountu.sh	Fri Dec  6 12:34:14 2013	(r259027)
@@ -75,27 +75,27 @@ sleep 1
 
 if ! mount -u -o ro $mntpoint 2>&1 | grep -q "Device busy"; then
 	echo "NFS FAILED"
-	pstat
 fi
 wait
 umount $mntpoint
 
-mdconfig -a -t swap -s 100m -u $mdstart
-bsdlabel -w md${mdstart} auto
-newfs_msdos -F 16 -b 8192 /dev/md${mdstart}a > /dev/null 2>&1
-mount_msdosfs -m 777 /dev/md${mdstart}a $mntpoint
-/tmp/mountu $mntpoint/file &
-
-sleep 1
-if ! mount -u -o ro $mntpoint 2>&1 | grep -q "Device busy"; then
-	echo "MSDOS FAILED"
-	pstat
+if [ -x /sbin/mount_msdosfs ]; then
+	mdconfig -a -t swap -s 100m -u $mdstart
+	bsdlabel -w md${mdstart} auto
+	newfs_msdos -F 16 -b 8192 /dev/md${mdstart}a > /dev/null 2>&1
+	mount_msdosfs -m 777 /dev/md${mdstart}a $mntpoint
+	/tmp/mountu $mntpoint/file &
+
+	sleep 1
+	if ! mount -u -o ro $mntpoint 2>&1 | grep -q "Device busy"; then
+		echo "MSDOS FAILED"
+	fi
+	wait
+
+	while mount | grep -q "$mntpoint "; do
+		umount $mntpoint || sleep 1
+	done
 fi
-wait
-
-while mount | grep -q "$mntpoint "; do
-	umount $mntpoint || sleep 1
-done
 rm -f /tmp/mountu /tmp/file
 exit 0
 EOF