mkcephfs: misc cephx fixes

diff --git a/src/ceph_common.sh b/src/ceph_common.sh
index 545920e6cb21bbd4ef6307cfb28e79591a59cb12..c4fa6acef4619acc7798c95bbbd2dd79a6286f8d 100644 (file)
--- a/src/ceph_common.sh
+++ b/src/ceph_common.sh
@@ -54,7 +54,7 @@ check_host() {
        host=$hostname
     fi
 
-    echo -n "=== $name === "
+    echo "=== $name === "
 
     return 0
 }

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 4e218f2e6afb1acfa374964933a55904e7112256..eba41415d64e7eda8cda8d5ce82942204bd95da6 100644 (file)
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -191,7 +191,7 @@ for name in $what; do
 
     if [ "$type" = "mon" ]; then
        if [ -n "$ssh" ]; then
-           scp -q $monkeyring $host:$tmpkeyring
+           scp -q $monkeyring $user@$host:$tmpkeyring
        else
            cp $monkeyring $tmpkeyring
        fi
@@ -215,30 +215,29 @@ for name in $what; do
            do_root_cmd "umount $btrfs_path ; for f in $btrfs_devs ; do umount \$f ; done ; modprobe btrfs ; mkfs.btrfs $btrfs_devs ; modprobe btrfs ; btrfsctl -a ; mount -t btrfs $btrfs_opt $first_dev $btrfs_path ; chown $osd_user $btrfs_path ; chmod +w $btrfs_path "
        fi
 
+       [ -n "$ssh" ] && scp $monmap $host:$monmap
+       do_cmd "$BINDIR/cosd -c $conf --monmap $monmap -i $num --mkfs --osd-data $osd_data"
+
        if [ -n "$keyring" ]; then
            if [ -n "$ssh" ]; then
-               scp -q /tmp/keyring.osd.$id $host:$keyring
+               scp /tmp/keyring.osd.$id $user@$host:$keyring
            else
                cp -v /tmp/keyring.osd.$id $keyring
            fi
        fi
        rm /tmp/keyring.osd.$id
-
-       [ -n "$ssh" ] && scp $monmap $host:$monmap
-       do_cmd "$BINDIR/cosd -c $conf --monmap $monmap -i $num --mkfs --osd-data $osd_data"
     fi
 
     if [ "$type" = "mds" ]; then
        get_conf keyring "" "keyring"
        if [ -n "$keyring" ]; then
            if [ -n "$ssh" ]; then
-               scp -q /tmp/keyring.mds.$id $host:$keyring
+               scp /tmp/keyring.mds.$id $user@$host:$keyring
            else
                cp -v /tmp/keyring.mds.$id $keyring
            fi
        fi
        rm /tmp/keyring.mds.$id
-       echo
     fi
 
 done