From owner-svn-src-user@FreeBSD.ORG  Sun Apr  7 10:55:39 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])
 by hub.freebsd.org (Postfix) with ESMTP id A74ACD70;
 Sun,  7 Apr 2013 10:55:39 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9B3821EA;
 Sun,  7 Apr 2013 10:55:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r37AtdAS014315;
 Sun, 7 Apr 2013 10:55:39 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r37Atd1g014314;
 Sun, 7 Apr 2013 10:55:39 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201304071055.r37Atd1g014314@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 7 Apr 2013 10:55:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r249228 - 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.14
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: Sun, 07 Apr 2013 10:55:39 -0000

Author: pho
Date: Sun Apr  7 10:55:39 2013
New Revision: 249228
URL: http://svnweb.freebsd.org/changeset/base/249228

Log:
  Do not run the test as root. If umount fails, use "umount -f".

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

Modified: user/pho/stress2/misc/nfs.sh
==============================================================================
--- user/pho/stress2/misc/nfs.sh	Sun Apr  7 10:52:28 2013	(r249227)
+++ user/pho/stress2/misc/nfs.sh	Sun Apr  7 10:55:39 2013	(r249228)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2008-2011 Peter Holm <pho@FreeBSD.org>
+# Copyright (c) 2008-2013 Peter Holm <pho@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,8 +40,9 @@ mount -t nfs -o tcp -o retrycnt=3 -o int
 export RUNDIR=$mntpoint/stressX
 export runRUNTIME=10m            # Run tests for 10 minutes
 
-(cd ..; ./run.sh disk.cfg) 
+su $testuser -c "(cd ..; ./run.sh disk.cfg)"
 
-while mount | grep "$mntpoint" | grep -q nfs; do
-	umount $mntpoint
+umount $mntpoint
+while mount | grep "$mntpoint " | grep -q nfs; do
+	umount -f $mntpoint
 done