From 1dd99f0fc91ee6d417325689f24601aa335b94c2 Mon Sep 17 00:00:00 2001 From: Xiaoxi Chen Date: Thu, 23 May 2013 09:33:27 +0800 Subject: [PATCH] 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 --- src/init-ceph.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/init-ceph.in b/src/init-ceph.in index e8a71949995ed..5914cd2294c63 100644 --- a/src/init-ceph.in +++ b/src/init-ceph.in @@ -310,7 +310,7 @@ for name in $what; do # command line, ceph.conf can override what it wants get_conf osd_location "" "osd crush location" get_conf osd_weight "" "osd crush initial weight" - defaultweight=`df $osd_data/. | tail -1 | awk '{ d= $2/1073741824 ; r = sprintf("%.2f", d); print r }'` + 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" $BINDIR/ceph \ --name="osd.$id" \ @@ -320,7 +320,7 @@ for name in $what; do "$id" \ "${osd_weight:-${defaultweight:-1}}" \ root=default \ - host="$(hostname -s)" \ + host=$host \ $osd_location \ || : fi -- 2.39.5