From owner-svn-src-user@FreeBSD.ORG  Thu Dec  5 11:42:04 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 05DEBE3D;
 Thu,  5 Dec 2013 11:42:04 +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 CE422152F;
 Thu,  5 Dec 2013 11:42:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5Bg3bv093471;
 Thu, 5 Dec 2013 11:42:03 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5Bg3GZ093470;
 Thu, 5 Dec 2013 11:42:03 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201312051142.rB5Bg3GZ093470@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Thu, 5 Dec 2013 11:42:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258976 - 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 11:42:04 -0000

Author: pho
Date: Thu Dec  5 11:42:03 2013
New Revision: 258976
URL: http://svnweb.freebsd.org/changeset/base/258976

Log:
  Use PATH_FSTAB and shell script cleanup.
  
  Sponsored by:	EMC / Isilon storage division

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

Modified: user/pho/stress2/misc/quota2.sh
==============================================================================
--- user/pho/stress2/misc/quota2.sh	Thu Dec  5 11:40:20 2013	(r258975)
+++ user/pho/stress2/misc/quota2.sh	Thu Dec  5 11:42:03 2013	(r258976)
@@ -33,29 +33,25 @@
 . ../default.cfg
 
 D=$diskimage
-trap "rm -f $D" 0
+export PATH_FSTAB=/tmp/fstab
+trap "rm -f $D $PATH_FSTAB" 0
 dede $D 1m 128 || exit 1
 
-mount | grep "${mntpoint}" | grep md${mdstart}${part} > /dev/null && umount ${mntpoint}
-mdconfig -l | grep md${mdstart} > /dev/null &&  mdconfig -d -u ${mdstart}
+mount | grep "$mntpoint" | grep md${mdstart}$part > /dev/null && umount $mntpoint
+mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 
-mdconfig -a -t vnode -f $D -u ${mdstart}
-bsdlabel -w md${mdstart} auto
-newfs -U  md${mdstart}${part} > /dev/null
-echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" >> /etc/fstab
+mdconfig -a -t vnode -f $D -u $mdstart
+bsdlabel -w md$mdstart auto
+newfs $newfs_flags  md${mdstart}$part > /dev/null
+echo "/dev/md${mdstart}$part $mntpoint ufs rw,userquota 2 2" > $PATH_FSTAB
 mount ${mntpoint}
-edquota -u -f ${mntpoint} -e ${mntpoint}:100000:110000:15000:16000 root
-quotacheck ${mntpoint}
-quotaon ${mntpoint}
-quota root
-df -i ${mntpoint}
-sed -i -e "/md${mdstart}${part}/d" /etc/fstab	# clean up before any panics
+edquota -u -f $mntpoint -e $mntpoint:100000:110000:15000:16000 root
+quotacheck $mntpoint
+quotaon $mntpoint
 export RUNDIR=${mntpoint}/stressX
 export runRUNTIME=10m            # Run tests for 10 minutes
 (cd ..; ./run.sh disk.cfg)
-false
-while [ $? -ne 0 ]; do
-	umount ${mntpoint} > /dev/null 2>&1
+while mount | grep $mntpoint | grep -q /dev/md; do
+	umount $mntpoint || sleep 1
 done
-mdconfig -d -u ${mdstart}
-rm -f $D
+mdconfig -d -u $mdstart