modified: src/init-ceph.in

	fixed bug in init script, the "df" should be run on remote host by do_cmd,
	and use $host instead of "hostname -s"

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
(cherry picked from commit 1dd99f0fc91ee6d417325689f24601aa335b94c2)

Conflicts:

	src/init-ceph.in

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 88fe6eb7d367257e212fc9d7c9a5130c8f33051b..a7e026d23d0cf1807b7a2db229549af8641f824c 100644 (file)
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -311,7 +311,6 @@ for name in $what; do
                    get_conf osd_location "" "osd crush location"
                    get_conf osd_weight "" "osd crush initial weight"
                    defaultweight="$(do_cmd "df $osd_data/. | tail -1 | awk '{ d= \$2/1073741824 ; r = sprintf(\"%.2f\", d); print r }'")"
-
                    get_conf osd_keyring "$osd_data/keyring" "keyring"
                    do_cmd "$BINDIR/ceph \
                        --name=osd.$id \