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
+5 -2
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# XFS QA Test No. 053
# FS QA Test No. 053
#
# xfs_repair breaks acls
#
@@ -51,9 +51,12 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
. ./common.filter
. ./common.attr
# real QA test starts here
_supported_fs xfs
_supported_os Linux
[ ! -x /bin/chacl -a ! -x /usr/bin/chacl ] && _notrun "chacl command not found"
# real QA test starts here
_require_scratch
_acl_setup_ids
_do_die_on_error=y