From 30d9fcc3b2426a0edeb20d6925e7ac63bae83354 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 2 Mar 2016 11:54:59 +0100 Subject: 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 > Reviewed-on: http://review.gluster.org/12988 > Reviewed-by: Niels de Vos > Tested-by: Niels de Vos Change-Id: Ice3c877f6ab346b04292e3dfed968d04d15077a5 BUG: 1297209 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/13579 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/mount/fuse/utils/mount.glusterfs.in | 1 - 1 file changed, 1 deletion(-) 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; -- cgit