summaryrefslogtreecommitdiffstats
path: root/xlators/mount
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2016-05-30 21:01:29 +0200
committerNiels de Vos <ndevos@redhat.com>2016-05-31 02:01:41 -0700
commitc8da5669a15ed6944cceb9d003789ff333754bff (patch)
tree7805815accecfcbd60849609a9f3159be8519689 /xlators/mount
parent3d75e32d6ada03c979077681ff414d948800f07e (diff)
fuse: accept the -s option to allow automounting
autofs passes the -s option when mounting. All /sbin/mount.<fs> helpers accept this, except mount.glusterfs. Because the helper fails when -s is passed accessing the mountpoint through autofs gives the following error: $ ls /lan/storage.lan.example.net/repos ls: cannot open directory /lan/storage.lan.example.net/repos: Too many levels of symbolic links BUG: 1340936 Change-Id: I84755cdac59e630618cb745c0eb3228cc1e93a1a Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/14559 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Smoke: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Diffstat (limited to 'xlators/mount')
-rwxr-xr-xxlators/mount/fuse/utils/mount.glusterfs.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index 78e32826b0b..0fc0cf4a4e3 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -588,7 +588,7 @@ main ()
## `mount` specifies options as a last argument
shift 2;
fi
- while getopts "Vo:hn" opt; do
+ while getopts "Vo:hns" opt; do
case "${opt}" in
o)
parse_options ${OPTARG};
@@ -596,6 +596,9 @@ main ()
;;
n)
;;
+ s)
+ # accept+ignore sloppy mount, passed by autofs
+ ;;
V)
${cmd_line} -V;
exit 0;