From owner-svn-src-user@freebsd.org  Fri Sep  9 08:53:06 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D1C8BD2A7B
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri,  9 Sep 2016 08:53:06 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D22A0B92;
 Fri,  9 Sep 2016 08:53:05 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u898r5h8092085;
 Fri, 9 Sep 2016 08:53:05 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u898r4Fs092083;
 Fri, 9 Sep 2016 08:53:04 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201609090853.u898r4Fs092083@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Fri, 9 Sep 2016 08:53:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r305656 - 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.23
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Sep 2016 08:53:06 -0000

Author: pho
Date: Fri Sep  9 08:53:04 2016
New Revision: 305656
URL: https://svnweb.freebsd.org/changeset/base/305656

Log:
  Added missing mdconfig(8) cleanup.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/misc/sendfile5.sh
  user/pho/stress2/misc/setuid.sh

Modified: user/pho/stress2/misc/sendfile5.sh
==============================================================================
--- user/pho/stress2/misc/sendfile5.sh	Fri Sep  9 08:51:02 2016	(r305655)
+++ user/pho/stress2/misc/sendfile5.sh	Fri Sep  9 08:53:04 2016	(r305656)
@@ -54,7 +54,6 @@ cp $diskimage $mntpoint
 /tmp/sendfile5 $mntpoint/$file
 umount $mntpoint
 
-mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 mdconfig -a -t swap -s 2g -u $mdstart || exit 1
 bsdlabel -w md$mdstart auto
 newfs $newfs_flags md${mdstart}$part > /dev/null
@@ -63,6 +62,7 @@ echo "Testing FFS"
 cp $diskimage $mntpoint
 /tmp/sendfile5 $mntpoint/$file
 umount $mntpoint
+mdconfig -d -u $mdstart
 
 mount -t nullfs $dir $mntpoint
 echo "Testing nullfs(5)"

Modified: user/pho/stress2/misc/setuid.sh
==============================================================================
--- user/pho/stress2/misc/setuid.sh	Fri Sep  9 08:51:02 2016	(r305655)
+++ user/pho/stress2/misc/setuid.sh	Fri Sep  9 08:53:04 2016	(r305656)
@@ -74,6 +74,7 @@ echo "Expect Abort trap"
 while mount | grep "on $mntpoint " | grep -q /dev/md; do
 	umount $mntpoint || sleep 1
 done
+mdconfig -d -u $mdstart
 rm -f /tmp/setuid /tmp/nop
 exit
 EOF