summaryrefslogtreecommitdiffstats
path: root/xlators/mount
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2016-03-02 11:54:59 +0100
committerVijay Bellur <vbellur@redhat.com>2016-03-08 11:09:28 -0800
commit30d9fcc3b2426a0edeb20d6925e7ac63bae83354 (patch)
tree3af446c30fad08a7e85edc8bd80381ecec2c762a /xlators/mount
parent16f42cdef539d5c63784f989af9ae877a94d72e7 (diff)
no-mtab (-n) mount option ignore next mount option
The -n option does not take any arguments. It seems like this shift is removing the next option. On my CentOS 7 system, automount calls mount.glusterfs with the parameters: host:/volume /mountpoint -n -o rw,acl,_netdev This causes the -o option to be siliently ignored. Cherry picked from commit 9e7cd9456532caa7b255978b4b435418c04e0db9: > Change-Id: Ice3c877f6ab346b04292e3dfed968d04d15077a5 > BUG: 1297195 > Signed-off-by: James Augustine <jcaugust81@gmail.com> > Reviewed-on: http://review.gluster.org/12988 > Reviewed-by: Niels de Vos <ndevos@redhat.com> > Tested-by: Niels de Vos <ndevos@redhat.com> Change-Id: Ice3c877f6ab346b04292e3dfed968d04d15077a5 BUG: 1297209 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/13579 Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/mount')
-rwxr-xr-xxlators/mount/fuse/utils/mount.glusterfs.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index ae3a075f9a8..7f314da69ec 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -573,7 +573,6 @@ main ()
shift 2;
;;
n)
- shift 1;
;;
V)
${cmd_line} -V;