diff options
| author | Niels de Vos <ndevos@redhat.com> | 2016-05-30 21:01:29 +0200 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2016-06-06 00:45:34 -0700 |
| commit | 0513e1f1bfa85c20ea3324b512d294cefa9177f8 (patch) | |
| tree | 29cb46eaa03c2ae59110a7ae320f793c3445b999 /xlators/mount | |
| parent | 0bbeef54babe08413f8e7f0e7d25e7fe184b19d1 (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
Cherry picked from commit c8da5669a15ed6944cceb9d003789ff333754bff:
> 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>
Change-Id: I84755cdac59e630618cb745c0eb3228cc1e93a1a
BUG: 1340935
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/14564
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Diffstat (limited to 'xlators/mount')
| -rwxr-xr-x | xlators/mount/fuse/utils/mount.glusterfs.in | 5 |
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 acdbca3467f..6c4cdfed062 100755 --- a/xlators/mount/fuse/utils/mount.glusterfs.in +++ b/xlators/mount/fuse/utils/mount.glusterfs.in @@ -595,7 +595,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}; @@ -603,6 +603,9 @@ main () ;; n) ;; + s) + # accept+ignore sloppy mount, passed by autofs + ;; V) ${cmd_line} -V; exit 0; |