From 591dfd1fc56a18a5a14f24242a3127c108dacaa5 Mon Sep 17 00:00:00 2001
From: bobijam <bobijam>
Date: Thu, 16 Aug 2007 03:21:49 +0000
Subject: [PATCH] Branch HEAD 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".
---
 lustre/ChangeLog         | 6 ++++++
 lustre/tests/acl/cp.test | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 5d88c9c..43f7c8a 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -90,6 +90,12 @@ Description: lstripe command fails for valid OST index
 Details    : The stripe offset is compared to lov->desc.ld_tgt_count
 	     instead of lov->desc.ld_active_tgt_count.
 
+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-10         Cluster File Systems, Inc. <info@clusterfs.com>
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
-- 
1.8.3.1