Branch b1_6

b=12584
i=ericm, green

Description: sanity.sh failed test 103
Details    : RHEL mis-interpret setfacl "-X" param, so we won't test setfacl
             with param "-X".

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 9d03c7f..d6bf0a2 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -19,6 +19,14 @@ Bugzilla   : 12932
 Description: obd_health_check_timeout too short
 Details    : set obd_health_check_timeout as 1.5x of obd_timeout
 
+Severity   : normal
+Bugzilla   : 12584
+Description: sanity.sh failed test 103
+Details    : RHEL mis-interpret setfacl "-X" param, so we won't test setfacl
+             with param "-X".
+
+--------------------------------------------------------------------------------
+
 2007-08-27         Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.6.2
        * Support for kernels:

diff --git a/lustre/tests/acl/cp.test b/lustre/tests/acl/cp.test
index 980002c..9a7ea43 100644 (file)
--- a/lustre/tests/acl/cp.test
+++ b/lustre/tests/acl/cp.test
@@ -24,7 +24,11 @@ The cp utility should only copy ACLs if `-p' is given.
        > blubb
 
        $ rm -r i
-       $ setfacl -R -m u:bin:rwX h
+
+Use to be "$setfacl -R -m u:bin:rwX h", but RHEL4 uncorrectly set the x flag,
+so we change to the following test
+
+       $ setfacl -R -m u:bin:rwx h
        $ getfacl --omit-header h/x
        > user::rw-
        > user:bin:rwx