From: Xiaoxi Chen <xiaoxi.chen@intel.com>
Date: Thu, 23 May 2013 01:33:27 +0000 (+0800)
Subject: modified:   src/init-ceph.in
X-Git-Tag: v0.63~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e09e94424b52ea6695bab46c217b16850b47ec3c;p=ceph.git

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 88fe6eb7d367..a7e026d23d0c 100644
--- 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 \