mkcephfs: some fixes

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/ceph_common.sh b/src/ceph_common.sh
index 558e2d6bea623da2e8f890d45c0b0e3115c9607e..4b03aa2493740c2fe91fc8ddd73b5b2f017f94f1 100644 (file)
--- a/src/ceph_common.sh
+++ b/src/ceph_common.sh
@@ -88,8 +88,8 @@ do_cmd() {
            sudo su $user -c "$1" || { [ -z "$3" ] && echo "failed: '$1'" && exit 1; }
        fi
     else
-       [ $verbose -eq 1 ] && echo "--- $ssh $2 \"cd $dir ; ulimit -c unlimited ; $1\""
-       $ssh $2 "cd $dir ; ulimit -c unlimited ; $1" || { [ -z "$3" ] && echo "failed: '$ssh $1'" && exit 1; }
+       [ $verbose -eq 1 ] && echo "--- $ssh $2 \"cd $sshdir ; ulimit -c unlimited ; $1\""
+       $ssh $2 "cd $sshdir ; ulimit -c unlimited ; $1" || { [ -z "$3" ] && echo "failed: '$ssh $1'" && exit 1; }
     fi
 }
 
@@ -104,8 +104,8 @@ do_root_cmd() {
            sudo bash -c "$1" || { echo "failed: '$1'" ; exit 1; }
        fi
     else
-       [ $verbose -eq 1 ] && echo "--- $rootssh $2 \"cd $dir ; ulimit -c unlimited ; $1\""
-       $rootssh $2 "cd $dir ; ulimit -c unlimited ; $1" || { echo "failed: '$rootssh $1'" ; exit 1; }
+       [ $verbose -eq 1 ] && echo "--- $rootssh $2 \"cd $sshdir ; ulimit -c unlimited ; $1\""
+       $rootssh $2 "cd $sshdir ; ulimit -c unlimited ; $1" || { echo "failed: '$rootssh $1'" ; exit 1; }
     fi
 }
 

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index bde3a6b9d9a1160c17dad055e3d4a611f7fa3e0a..7755a28638515032ffd8c7b0fa496a7d6c660253 100644 (file)
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -241,10 +241,10 @@ if [ -n "$initlocaldaemons" ]; then
 fi
 
 
-### prepare-btrfs ###
+### prepare-osdfs ###
 
-if [ -n "$preparebtrfs" ]; then
-    name=$preparebtrfs
+if [ -n "$prepareosdfs" ]; then
+    name=$prepareosdfs
     type=`echo $name | cut -c 1-3`   # e.g. 'mon', if $name is 'mon1'
     id=`echo $name | cut -c 4- | sed 's/\\.//'`
     name="$type.$id"
@@ -398,7 +398,7 @@ if [ $allhosts -eq 1 ]; then
        fi
        
        if [ $mkbtrfs -eq 1 ]; then
-           do_root_cmd "$0 -d $rdir --prepare-btrfs $name"
+           do_root_cmd "$0 -d $rdir --prepare-osdfs $name"
        fi
 
        do_cmd "$0 -d $rdir --init-daemon $name"