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
+3 -2
View File
@@ -109,9 +109,10 @@ _filter_aces()
_acl_requirements()
{
xfsdir=$TEST_DIR
if [ ! -x /bin/chacl -a ! -x /usr/bin/chacl ]; then
_notrun "chacl command not found"
if [ ! -x /bin/chacl -a ! -x /usr/bin/chacl -a ! -x /sbin/chacl ]; then
_notrun "chacl command not found"
fi
# test if acl_get syscall is operational