Fixed merge problems

This commit is contained in:
ptools
2004-06-15 07:32:36 +00:00
parent 2c3b0bab9f
commit cb6beb9759
144 changed files with 2372 additions and 2383 deletions
+7 -3
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 067
#! /bin/sh -x
# FS QA Test No. 067
#
# Test out acl/dacls which fit in shortform in the inode
#
@@ -52,7 +52,11 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.attr
# real QA test starts here
#
_supported_fs xfs
_supported_os Linux
[ -x /usr/bin/chacl ] || _notrun "chacl executable not found"
_need_to_be_root
_acl_requirements
_require_scratch