summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-12-12 21:14:13 -0800
committerSage Weil <sage@inktank.com>2012-12-12 21:14:38 -0800
commit448db47965d5602f295c894499467df19f609384 (patch)
tree9f3c4abae4a52137f458118b9b808a234a3c1515
parentae100cfdbcedb1b47712d74af663dd617c0fd646 (diff)
downloadceph-448db47965d5602f295c894499467df19f609384.tar.gz
mount.fuse.ceph: strip out noauto option
mount -a uses this, but also passes it to mount.fuse.ceph, and libceph complains: fuse: unknown option `noauto' Signed-off-by: Sage Weil <sage@inktank.com>
-rwxr-xr-xsrc/mount.fuse.ceph12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/mount.fuse.ceph b/src/mount.fuse.ceph
index f579953981a..cbf2874f3bd 100755
--- a/src/mount.fuse.ceph
+++ b/src/mount.fuse.ceph
@@ -15,6 +15,12 @@
# ceph-fuse can be passed in this way.
set -e
-options='--'`echo $1 | sed 's/,/ --/g'`
-shift
-exec ceph-fuse $options $@
+
+# convert device string to options
+cephargs='--'`echo $1 | sed 's/,/ --/g'`
+
+# strip out 'noauto' option; libfuse doesn't like it
+opts=`echo $4 | sed 's/,noauto//' | sed 's/noauto,//'`
+
+# go
+exec ceph-fuse $cephargs $2 $3 $opts