From: bobijam <bobijam>
Date: Thu, 16 Aug 2007 14:16:43 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_8_0_110~1327
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=892529740471a148277dad6c1a1c609b9892b2a5;p=fs%2Flustre-release.git

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
--- 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
--- 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