diff options
Diffstat (limited to 'xlators/mount/fuse/utils/mount.glusterfs.in')
| -rwxr-xr-x | xlators/mount/fuse/utils/mount.glusterfs.in | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in index 3e8fa40427c..84bcfaa525e 100755 --- a/xlators/mount/fuse/utils/mount.glusterfs.in +++ b/xlators/mount/fuse/utils/mount.glusterfs.in @@ -120,10 +120,6 @@ start_glusterfs () cmd_line=$(echo "$cmd_line --mem-accounting"); fi - if [ -n "$aux_gfid_mount" ]; then - cmd_line=$(echo "$cmd_line --aux-gfid-mount"); - fi - #options with values start here if [ -n "$log_level" ]; then cmd_line=$(echo "$cmd_line --log-level=$log_level"); @@ -270,13 +266,13 @@ mount.glusterfs --version" # check for recursive mounts. i.e, mounting over an existing brick check_recursive_mount () { - if [ $1 = "/" ]; then + if [ $2 = "/" ]; then echo Cannot mount over root; exit 2; fi # GFID check first # remove trailing / from mount point - mnt_dir=${1%/}; + mnt_dir=${2%/}; export PATH; # check whether getfattr exists @@ -335,6 +331,7 @@ check_recursive_mount () main () { helper=$(echo "$@" | sed -n 's/.*\--[ ]*\([^ ]*\).*/\1/p'); + in_opt="no" pos_args=0 for opt in "$@"; do @@ -349,11 +346,6 @@ main () "fopen-keep-cache") fopen_keep_cache=1 ;; "enable-ino32") enable_ino32=1 ;; "mem-accounting") mem_accounting=1;; - "aux-gfid-mount") - if [ `uname -s` = "Linux" ]; then - aux_gfid_mount=1 - fi - ;; # "mount -t glusterfs" sends this, but it's useless. "rw") ;; # these ones are interpreted during system initialization @@ -443,7 +435,7 @@ main () exit 0; fi - check_recursive_mount "$mount_point"; + check_recursive_mount "$@"; # Append fuse.glusterfs to PRUNEFS variable in updatedb.conf(5). updatedb(8) # should not index files under GlusterFS, indexing will slow down GlusteFS |