From owner-svn-src-user@FreeBSD.ORG  Thu Dec  5 15:28:27 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 DE7A8FFD;
 Thu,  5 Dec 2013 15:28:27 +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 CBE1B1489;
 Thu,  5 Dec 2013 15:28:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5FSR9c069636;
 Thu, 5 Dec 2013 15:28:27 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5FSRa1069635;
 Thu, 5 Dec 2013 15:28:27 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201312051528.rB5FSRa1069635@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Thu, 5 Dec 2013 15:28:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258988 - 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: Thu, 05 Dec 2013 15:28:27 -0000

Author: pho
Date: Thu Dec  5 15:28:27 2013
New Revision: 258988
URL: http://svnweb.freebsd.org/changeset/base/258988

Log:
  Use mount point defined in default.cfg
  
  Sponsored by:	EMC / Isilon storage division

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

Modified: user/pho/stress2/misc/nullfs2.sh
==============================================================================
--- user/pho/stress2/misc/nullfs2.sh	Thu Dec  5 15:23:41 2013	(r258987)
+++ user/pho/stress2/misc/nullfs2.sh	Thu Dec  5 15:28:27 2013	(r258988)
@@ -34,19 +34,14 @@
 
 . ../default.cfg
 
-[ -d mp1 ] || mkdir mp1
+mount | grep -q "on $mntpoint " && umount -f $mntpoint
 
-mp=`pwd`/mp1
-mount | grep -q $mp && umount -f $mp
+mount -t nullfs $RUNDIR $mntpoint
 
-mount -t nullfs `dirname $RUNDIR` $mp
-
-export RUNDIR=`pwd`/mp1/stressX
+export RUNDIR=$mntpoint/stressX
 export runRUNTIME=10m
 (cd ..; ./run.sh marcus.cfg) 
 
-umount $mp 2>&1 | grep -v busy
-
-mount | grep -q $mp && umount -f $mp
-
-rm -rf mp1
+while mount | grep -q "on $mntpoint "; do
+	umount $mntpoint || sleep 1
+done