From owner-svn-src-projects@FreeBSD.ORG  Thu Dec 29 12:33:42 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 84E881065670;
	Thu, 29 Dec 2011 12:33:42 +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 565008FC1A;
	Thu, 29 Dec 2011 12:33:42 +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 pBTCXgon056306;
	Thu, 29 Dec 2011 12:33:42 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBTCXgsX056304;
	Thu, 29 Dec 2011 12:33:42 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201112291233.pBTCXgsX056304@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Thu, 29 Dec 2011 12:33:42 +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: r228954 - 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 12:33:42 -0000

Author: pho
Date: Thu Dec 29 12:33:41 2011
New Revision: 228954
URL: http://svn.freebsd.org/changeset/base/228954

Log:
  Use the global configuration file and limit runtime to 30 minutes.

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

Modified: projects/stress2/misc/snap5-1.sh
==============================================================================
--- projects/stress2/misc/snap5-1.sh	Thu Dec 29 12:33:27 2011	(r228953)
+++ projects/stress2/misc/snap5-1.sh	Thu Dec 29 12:33:41 2011	(r228954)
@@ -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,26 +30,30 @@
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 
-[ ! -d /mnt2 ] && mkdir /mnt2
+. ../default.cfg
+
+mnt2=${mntpoint}2
+[ ! -d $mnt2 ] && mkdir $mnt2
 
 trap "rm -f /tmp/.snap/pho" 0
-for i in `jot 64`; do
-   if mount | grep -q "/dev/md0 on /mnt2"; then
-      umount /mnt2 || exit 2
+start=`date '+%s'`
+while [ `date '+%s'` -lt $((start + 1800)) ]; do
+   if mount | grep -q "/dev/md$mdstart on $mnt2"; then
+      umount $mnt2 || exit 2
    fi
-   if mdconfig -l | grep -q md0; then
-      mdconfig -d -u 0 || exit 3
+   if mdconfig -l | grep -q md$mdstart; then
+      mdconfig -d -u $mdstart || exit 3
    fi
    rm -f /tmp/.snap/pho
 
    date '+%T'
    mksnap_ffs /tmp /tmp/.snap/pho || continue
-   mdconfig -a -t vnode -f /tmp/.snap/pho -u 0 -o readonly || exit 4
-   mount -o ro /dev/md0 /mnt2 || exit 5
+   mdconfig -a -t vnode -f /tmp/.snap/pho -u $mdstart -o readonly || exit 4
+   mount -o ro /dev/md$mdstart $mnt2 || exit 5
 
-   ls -l /mnt2 > /dev/null
+   ls -l $mnt2 > /dev/null
    r=`head -c4 /dev/urandom | od -N2 -tu4 | sed -ne '1s/  *$//;1s/.* //p'`
    sleep $(( r % 120 ))
 done
-mount | grep -q "/dev/md0 on /mnt2" && umount /mnt2
-mdconfig -l | grep -q md0 && mdconfig -d -u 0
+mount | grep -q "/dev/md$mdstart on $mnt2" && umount $mnt2
+mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart