From owner-svn-src-projects@FreeBSD.ORG  Thu Dec 29 11:36:25 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8BB411065670;
	Thu, 29 Dec 2011 11:36:25 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 773DA8FC0A;
	Thu, 29 Dec 2011 11:36:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBTBaP4Z054353;
	Thu, 29 Dec 2011 11:36:25 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBTBaPjp054351;
	Thu, 29 Dec 2011 11:36:25 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201112291136.pBTBaPjp054351@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Thu, 29 Dec 2011 11:36:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228949 - projects/stress2/misc
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Dec 2011 11:36:25 -0000

Author: pho
Date: Thu Dec 29 11:36:24 2011
New Revision: 228949
URL: http://svn.freebsd.org/changeset/base/228949

Log:
  Use the global configuration file for MD(4) operations.

Modified:
  projects/stress2/misc/snap2-1.sh

Modified: projects/stress2/misc/snap2-1.sh
==============================================================================
--- projects/stress2/misc/snap2-1.sh	Thu Dec 29 11:35:12 2011	(r228948)
+++ projects/stress2/misc/snap2-1.sh	Thu Dec 29 11:36:24 2011	(r228949)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2008 Peter Holm <pho@FreeBSD.org>
+# Copyright (c) 2008, 2011 Peter Holm <pho@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,8 @@
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
+. ../default.cfg
+
 # Regression test: Delete an active md device
 #
 # panic(c088cd33,deadc000,c0943aa0,0,c08753e1) at panic+0x14b
@@ -43,16 +45,16 @@
 rm -f /tmp/.snap/pho
 [ -d /tmp/.snap ] || mkdir /tmp/.snap
 trap "rm -f /tmp/.snap/pho" 0
-mount | grep "/mnt" | grep md0 > /dev/null && umount /mnt
-mdconfig -l | grep -q md0 &&  mdconfig -d -u 0
+mount | grep "$mntpoint" | grep -q md$mdstart && umount $mntpoint
+mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
 
 mksnap_ffs /tmp /tmp/.snap/pho
-mdconfig -a -t vnode -o readonly -f /tmp/.snap/pho -u 0
-mount -o ro /dev/md0 /mnt
+mdconfig -a -t vnode -o readonly -f /tmp/.snap/pho -u $mdstart
+mount -o ro /dev/md$mdstart $mntpoint
 
-ls -lR /mnt > /dev/null 2>&1 &
-mdconfig -d -u 0 > /dev/null 2>&1
+ls -lR $mntpoint > /dev/null 2>&1 &
+mdconfig -d -u $mdstart > /dev/null 2>&1
 
-umount -f /mnt
-mdconfig -d -u 0
+umount -f $mntpoint
+mdconfig -d -u $mdstart
 rm -f /tmp/.snap/pho