mkcephfs: skip non-btrfs osds even with --mkbtrfs

This lets you do a mixed btrfs and non-btrfs file systems.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index d2cb1de5dbf4e3c86a789ae2c91e79a3f7ab88d1..6087f7af907062ef2e33ca15d18a5325d2997445 100644 (file)
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -303,6 +303,12 @@ if [ -n "$prepareosdfs" ]; then
     get_conf osd_journal "" "osd journal"
     get_conf btrfs_path "$osd_data" "btrfs path"  # mount point defaults so osd data
     get_conf btrfs_devs "" "btrfs devs"
+
+    if [ -z "$btrfs_devs" ]; then
+       echo "no btrfs devs defined for $name"
+       exit 0
+    fi
+
     first_dev=`echo $btrfs_devs | cut '-d ' -f 1`
     get_conf btrfs_opt "noatime" "btrfs options"
     [ -n "$btrfs_opt" ] && btrfs_opt="-o $btrfs_opt"