From owner-svn-src-user@FreeBSD.ORG  Thu Dec  5 13:55:48 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 ADF5131A;
 Thu,  5 Dec 2013 13:55:48 +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 9B32D1E43;
 Thu,  5 Dec 2013 13:55:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5DtmRX038472;
 Thu, 5 Dec 2013 13:55:48 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5DtmoM038471;
 Thu, 5 Dec 2013 13:55:48 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201312051355.rB5DtmoM038471@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Thu, 5 Dec 2013 13:55:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258981 - 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 13:55:48 -0000

Author: pho
Date: Thu Dec  5 13:55:48 2013
New Revision: 258981
URL: http://svnweb.freebsd.org/changeset/base/258981

Log:
  Do not return an error if DEBUG_MEMGUARD is not configured,
  use newfs_flags for newfs(8),

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

Modified: user/pho/stress2/misc/memguard.sh
==============================================================================
--- user/pho/stress2/misc/memguard.sh	Thu Dec  5 13:51:19 2013	(r258980)
+++ user/pho/stress2/misc/memguard.sh	Thu Dec  5 13:55:48 2013	(r258981)
@@ -35,7 +35,7 @@
 
 . ../default.cfg
 
-sysctl vm | grep -q memguard || { echo "MEMGUARD(9) not enabled"; exit 1; }
+sysctl vm | grep -q memguard || { echo "MEMGUARD(9) not enabled"; exit 0; }
 
 mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint
 mdconfig -l | grep -q md$mdstart &&  mdconfig -d -u $mdstart
@@ -43,7 +43,7 @@ mdconfig -l | grep -q md$mdstart &&  mdc
 mdconfig -a -t swap -s 20m -u $mdstart || exit 1
 bsdlabel -w md$mdstart auto
 
-newfs -U md${mdstart}$part > /dev/null
+newfs $newfs_flags md${mdstart}$part > /dev/null
 
 mount /dev/md${mdstart}$part $mntpoint
 chmod 777 $mntpoint