diff options
| author | Samuel Just <samuel.just@dreamhost.com> | 2011-03-23 13:52:28 -0700 |
|---|---|---|
| committer | Samuel Just <samuel.just@dreamhost.com> | 2011-03-23 18:03:02 -0700 |
| commit | 54cc33c667d4ff2347831163e6dde5a8f7fea629 (patch) | |
| tree | d7a51ea8be930d393c4b5ecf0ed85c8c1d0cb3c1 /src/mkcephfs.in | |
| parent | ac5ad4eddb0fdb5f74e0d24884db3bcabc3742b2 (diff) | |
| download | ceph-54cc33c667d4ff2347831163e6dde5a8f7fea629.tar.gz | |
mkcephfs: minor fixes
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Diffstat (limited to 'src/mkcephfs.in')
| -rw-r--r-- | src/mkcephfs.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mkcephfs.in b/src/mkcephfs.in index dd2540d1995..f19e2cd52e4 100644 --- a/src/mkcephfs.in +++ b/src/mkcephfs.in @@ -267,17 +267,17 @@ if [ -n "$prepareosdfs" ]; then [ -n "$osd_journal" ] && test -d $osd_journal || mkdir -p `dirname $osd_journal` - umount $btrfs_path + umount $btrfs_path || true for f in $btrfs_devs ; do - umount $f + umount $f || true done - modprobe btrfs + modprobe btrfs || true echo mkfs.btrfs $btrfs_devs btrfsctl -a - echo mount -t btrfs $btrfs_opt $first_dev $btrfs_path - echo chown $osd_user $btrfs_path - echo chmod +w $btrfs_path + mount -t btrfs $btrfs_opt $first_dev $btrfs_path + chown $osd_user $btrfs_path + chmod +w $btrfs_path exit 0 fi @@ -397,7 +397,7 @@ if [ $allhosts -eq 1 ]; then pushed_to="$pushed_to $host " fi - if [ $mkbtrfs -eq 1 ]; then + if [ $mkbtrfs -eq 1 ] && $type = "osd"; then do_root_cmd "$0 -d $rdir --prepare-osdfs $name" fi |