diff options
| author | Sage Weil <sage@newdream.net> | 2011-10-28 11:42:04 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-10-28 11:42:04 -0700 |
| commit | 7ee0747cde4284e74364b7bab257ed783fe0e730 (patch) | |
| tree | 2a40c11c797589f033850a197a21bfb7636c1605 /src/mkcephfs.in | |
| parent | 2bb283ba3976e6c3b6a5af574a94056103e3817c (diff) | |
| download | ceph-7ee0747cde4284e74364b7bab257ed783fe0e730.tar.gz | |
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>
Diffstat (limited to 'src/mkcephfs.in')
| -rw-r--r-- | src/mkcephfs.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mkcephfs.in b/src/mkcephfs.in index d2cb1de5dbf..6087f7af907 100644 --- 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" |