From c8da5669a15ed6944cceb9d003789ff333754bff Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Mon, 30 May 2016 21:01:29 +0200 Subject: fuse: accept the -s option to allow automounting autofs passes the -s option when mounting. All /sbin/mount. 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 Reviewed-on: http://review.gluster.org/14559 NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Smoke: Gluster Build System Reviewed-by: Oleksandr Natalenko --- xlators/mount/fuse/utils/mount.glusterfs.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'xlators/mount/fuse/utils/mount.glusterfs.in') 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; -- cgit