From 5b7952cf531a4ecab77427d13b62b733661c976e Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Mon, 15 Dec 2014 14:02:52 +0100
Subject: Allow gluster to be used with linux automounter

Added (ignored) -n option to mount.glusterfs command

Cherry picked from commit f8496dab2f6111bdc5ced0881d15061160b76e52:
> Change-Id: I9209da215d38507cd9d01b1e9af4aecff4414f83
> BUG: 1123004
> Signed-off-by: Anders Blomdell <anders.blomdell@control.lth.se>
> Reviewed-on: http://review.gluster.org/8373
> Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com>
> Reviewed-by: Vijay Bellur <vbellur@redhat.com>

BUG: 1171259
Change-Id: I9209da215d38507cd9d01b1e9af4aecff4414f83
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/9279
Reviewed-by: Anders Blomdell <anders.blomdell@control.lth.se>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Tested-by: Harshavardhana <harsha@harshavardhana.net>
---
 xlators/mount/fuse/utils/mount.glusterfs.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'xlators/mount/fuse')

diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index 7852e385339..c8c32c66eb6 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -560,12 +560,15 @@ main ()
         ## `mount` specifies options as a last argument
         shift 2;
     fi
-    while getopts "Vo:h" opt; do
+    while getopts "Vo:hn" opt; do
         case "${opt}" in
             o)
                 parse_options ${OPTARG};
 		shift 2;
                 ;;
+            n)
+		shift 1;
+                ;;
             V)
                 ${cmd_line} -V;
                 exit 0;
-- 
cgit