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 785df6c1c6f6a21463f9982fef87a836dcbf9bfa..5290dcc379e2d1a794284dfaa9cc71eb85679373 100755 (executable)
--- 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