Index: stable/10/tools/regression/acltools/01.t
===================================================================
--- stable/10/tools/regression/acltools/01.t	(revision 271961)
+++ stable/10/tools/regression/acltools/01.t	(revision 271962)
@@ -1,86 +1,86 @@
 #!/bin/sh
 #
 # Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 # This is a wrapper script to run tools-nfs4.test on ZFS filesystem.
 #
 # WARNING: It uses hardcoded ZFS pool name "acltools"
 #
 # If any of the tests fails, here is how to debug it: go to
 # the directory with problematic filesystem mounted on it,
 # and do /path/to/test run /path/to/test tools-nfs4.test, e.g.
 #
 # /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test
 #
 # Output should be obvious.
 
 echo "1..4"
 
 if [ `whoami` != "root" ]; then
 	echo "not ok 1 - you need to be root to run this test."
 	exit 1
 fi
 
 TESTDIR=$(dirname $(realpath $0))
 
 # Set up the test filesystem.
 MD=`mdconfig -at swap -s 64m`
 MNT=`mktemp -dt acltools`
-zpool create -R $MNT acltools /dev/$MD
+zpool create -m $MNT acltools /dev/$MD
 if [ $? -ne 0 ]; then
 	echo "not ok 1 - 'zpool create' failed."
 	exit 1
 fi
 
 echo "ok 1"
 
 cd $MNT
 
 # First, check whether we can crash the kernel by creating too many
 # entries.  For some reason this won't work in the test file.
 touch xxx
 setfacl -x2 xxx
 while :; do setfacl -a0 u:42:rwx:allow xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done
 chmod 600 xxx
 rm xxx
 echo "ok 2"
 
 perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test > /dev/null
 
 if [ $? -eq 0 ]; then
 	echo "ok 3"
 else
 	echo "not ok 3"
 fi
 
 cd /
 zpool destroy -f acltools
 rmdir $MNT
 mdconfig -du $MD
 
 echo "ok 4"
Index: stable/10/tools/regression/acltools/03.t
===================================================================
--- stable/10/tools/regression/acltools/03.t	(revision 271961)
+++ stable/10/tools/regression/acltools/03.t	(revision 271962)
@@ -1,110 +1,110 @@
 #!/bin/sh
 #
 # Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 # This is a wrapper script to run tools-crossfs.test between UFS without
 # ACLs, UFS with POSIX.1e ACLs, and ZFS with NFSv4 ACLs.
 #
 # WARNING: It uses hardcoded ZFS pool name "acltools"
 #
 # Output should be obvious.
 
 echo "1..5"
 
 if [ `whoami` != "root" ]; then
 	echo "not ok 1 - you need to be root to run this test."
 	exit 1
 fi
 
 TESTDIR=$(dirname $(realpath $0))
 MNTROOT=`mktemp -dt acltools`
 
 # Set up the test filesystems.
 MD1=`mdconfig -at swap -s 64m`
 MNT1=$MNTROOT/nfs4
 mkdir $MNT1
-zpool create -R $MNT1 acltools /dev/$MD1
+zpool create -m $MNT1 acltools /dev/$MD1
 if [ $? -ne 0 ]; then
 	echo "not ok 1 - 'zpool create' failed."
 	exit 1
 fi
 
 echo "ok 1"
 
 MD2=`mdconfig -at swap -s 10m`
 MNT2=$MNTROOT/posix
 mkdir $MNT2
 newfs /dev/$MD2 > /dev/null
 mount -o acls /dev/$MD2 $MNT2
 if [ $? -ne 0 ]; then
 	echo "not ok 2 - mount failed."
 	exit 1
 fi
 
 echo "ok 2"
 
 MD3=`mdconfig -at swap -s 10m`
 MNT3=$MNTROOT/none
 mkdir $MNT3
 newfs /dev/$MD3 > /dev/null
 mount /dev/$MD3 $MNT3
 if [ $? -ne 0 ]; then
 	echo "not ok 3 - mount failed."
 	exit 1
 fi
 
 echo "ok 3"
 
 cd $MNTROOT
 
 perl $TESTDIR/run $TESTDIR/tools-crossfs.test > /dev/null
 
 if [ $? -eq 0 ]; then
 	echo "ok 4"
 else
 	echo "not ok 4"
 fi
 
 cd /
 
 umount -f $MNT3
 rmdir $MNT3
 mdconfig -du $MD3
 
 umount -f $MNT2
 rmdir $MNT2
 mdconfig -du $MD2
 
 zpool destroy -f acltools
 rmdir $MNT1
 mdconfig -du $MD1
 
 rmdir $MNTROOT
 
 echo "ok 5"
 
Index: stable/10/tools/regression/acltools/04.t
===================================================================
--- stable/10/tools/regression/acltools/04.t	(revision 271961)
+++ stable/10/tools/regression/acltools/04.t	(revision 271962)
@@ -1,69 +1,69 @@
 #!/bin/sh
 #
 # Copyright (c) 2011 Edward Tomasz Napierała <trasz@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 # This is a wrapper script to run tools-nfs4-trivial.test on ZFS filesystem.
 #
 # WARNING: It uses hardcoded ZFS pool name "acltools"
 
 echo "1..3"
 
 if [ `whoami` != "root" ]; then
 	echo "not ok 1 - you need to be root to run this test."
 	exit 1
 fi
 
 TESTDIR=$(dirname $(realpath $0))
 
 # Set up the test filesystem.
 MD=`mdconfig -at swap -s 64m`
 MNT=`mktemp -dt acltools`
-zpool create -R $MNT acltools /dev/$MD
+zpool create -m $MNT acltools /dev/$MD
 if [ $? -ne 0 ]; then
 	echo "not ok 1 - 'zpool create' failed."
 	exit 1
 fi
 
 echo "ok 1"
 
 cd $MNT
 
 perl $TESTDIR/run $TESTDIR/tools-nfs4-trivial.test > /dev/null
 
 if [ $? -eq 0 ]; then
 	echo "ok 2"
 else
 	echo "not ok 2"
 fi
 
 cd /
 zpool destroy -f acltools
 rmdir $MNT
 mdconfig -du $MD
 
 echo "ok 3"
Index: stable/10
===================================================================
--- stable/10	(revision 271961)
+++ stable/10	(revision 271962)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r271459