summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnand Avati <avati@gluster.com>2011-07-01 16:55:50 +0000
committerAnand Avati <avati@gluster.com>2011-07-01 15:58:49 -0700
commit6ca860420447b99ac14c2fe0a8c47dcd9960b15f (patch)
tree02f40013aeec67a71733a963971e4397933fb100
parentc2dc337ea32e123cb80bad559c6a075bfa1cb8c3 (diff)
mount.glusterfs: support -o acl parameterv3.2.2qa1
Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2815 (Server-enforced ACLs) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2815
-rwxr-xr-xxlators/mount/fuse/utils/mount.glusterfs.in7
1 files changed, 7 insertions, 0 deletions
diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index c805a7cd5a6..86dcef42727 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -73,6 +73,10 @@ start_glusterfs ()
cmd_line=$(echo "$cmd_line --read-only");
fi
+ if [ -n "$acl" ]; then
+ cmd_line=$(echo "$cmd_line --acl");
+ fi
+
if [ -n "$log_file" ]; then
cmd_line=$(echo "$cmd_line --log-file=$log_file");
fi
@@ -169,6 +173,8 @@ main ()
read_only=$(echo "$options" | sed -n 's/.*\(ro\)[^,]*.*/\1/p');
+ acl=$(echo "$options" | sed -n 's/.*\(acl\)[^,]*.*/\1/p');
+
transport=$(echo "$options" | sed -n 's/.*transport=\([^,]*\).*/\1/p');
direct_io_mode=$(echo "$options" | sed -n 's/.*direct-io-mode=\([^,]*\).*/\1/p');
@@ -208,6 +214,7 @@ main ()
-e 's/[,]*volume-id=[^,]*//' \
-e 's/[,]*log-server=[^,]*//' \
-e 's/[,]*ro[^,]*//' \
+ -e 's/[,]*acl[^,]*//' \
-e 's/[,]*log-server-port=[^,]*//');
#