From owner-svn-src-user@FreeBSD.ORG  Thu Dec  5 15:05:51 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 AAE2654D;
 Thu,  5 Dec 2013 15:05:51 +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 9833912A1;
 Thu,  5 Dec 2013 15:05:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5F5ppv062420;
 Thu, 5 Dec 2013 15:05:51 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5F5p5G062419;
 Thu, 5 Dec 2013 15:05:51 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201312051505.rB5F5p5G062419@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Thu, 5 Dec 2013 15:05:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258985 - 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:05:51 -0000

Author: pho
Date: Thu Dec  5 15:05:51 2013
New Revision: 258985
URL: http://svnweb.freebsd.org/changeset/base/258985

Log:
  Clean up old shell script, use newfs_flags for newfs(8).
  
  Sponsored by:	EMC / Isilon storage division

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

Modified: user/pho/stress2/misc/unionfs3.sh
==============================================================================
--- user/pho/stress2/misc/unionfs3.sh	Thu Dec  5 14:45:39 2013	(r258984)
+++ user/pho/stress2/misc/unionfs3.sh	Thu Dec  5 15:05:51 2013	(r258985)
@@ -33,20 +33,22 @@
 # Test with interchanged arguments to mount_unionfs
 # Causes page fault in vfs_mount.c:1975
 
-D=/usr/tmp/diskimage
-truncate -s 256M $D
+. ../default.cfg
 
-mount | grep "/mnt" | grep md0c > /dev/null && umount /mnt
-mdconfig -l | grep md0 > /dev/null &&  mdconfig -d -u 0
+truncate -s 256M $diskimage
 
-mdconfig -a -t vnode -f $D -u 0
-bsdlabel -w md0 auto
-newfs -U  md0c > /dev/null
-mount /dev/md0c /mnt
-mount -t unionfs -o noatime /tmp /mnt
+mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
+mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
+
+mdconfig -a -t vnode -f $diskimage -u $mdstart
+bsdlabel -w md$mdstart auto
+newfs $newfs_flags md${mdstart}$part > /dev/null
+mount /dev/md${mdstart}$part $mntpoint
+mount -t unionfs -o noatime /tmp $mntpoint
 umount -f /tmp	# panic
 mount /tmp
-mount | grep "/mnt" | grep md0c > /dev/null && umount    /mnt
-mount | grep "/mnt" | grep md0c > /dev/null && umount -f /mnt
-mdconfig -d -u 0
-rm -f $D
+while mount | grep $mntpoint | grep -q /dev/md; do
+	umount $mntpoint || sleep 1
+done
+mdconfig -d -u $mdstart
+rm -f $diskimage