From: Florent <florent@coppint.com>
Date: Thu, 11 Feb 2016 13:51:49 +0000 (+0100)
Subject: Better parsing of arguments passed to mount.fuse.ceph by mount command.
X-Git-Tag: v10.1.0~400^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7607%2Fhead;p=ceph.git

Better parsing of arguments passed to mount.fuse.ceph by mount command.

Signed-off-by: Florent Bautista <florent@coppint.com>
---

diff --git a/src/mount.fuse.ceph b/src/mount.fuse.ceph
index 785df6c1c6f6..5290dcc379e2 100755
--- a/src/mount.fuse.ceph
+++ b/src/mount.fuse.ceph
@@ -19,11 +19,23 @@ set -e
 # convert device string to options
 cephargs='--'`echo $1 | sed 's/,/ --/g'`
 
+# get mount point
+mountpoint=$2
+
+shift 2
+
+while [ "$1" != "-o" ]
+do
+        shift
+done
+
+opts=$2
+
 # strip out 'noauto' option; libfuse doesn't like it
-opts=`echo $4 | sed 's/,noauto//' | sed 's/noauto,//'`
+opts=`echo $opts | sed 's/,noauto//' | sed 's/noauto,//'`
 
 # strip out '_netdev' option; libfuse doesn't like it
 opts=`echo $opts | sed 's/,_netdev//' | sed 's/_netdev,//'`
 
 # go
-exec ceph-fuse $cephargs $2 $3 $opts
+exec ceph-fuse $cephargs $mountpoint -o $opts