diff options
author | Sage Weil <sage@inktank.com> | 2012-12-27 16:06:24 -0800 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2012-12-28 12:12:26 -0800 |
commit | 9483a032f750572586f146c696ec6501d3df0383 (patch) | |
tree | bf74e222589bee53be8a72c329f51f15d6b89c4e | |
parent | 8fef9360fe949fbf4ee6e468c36cc1c84b369b6e (diff) | |
download | ceph-9483a032f750572586f146c696ec6501d3df0383.tar.gz |
init-ceph: fix status version check across machines
The local state isn't propagated into the backtick shell, resulting in
'unknown' for all remote daemons. Avoid backticks altogether.
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 6c7b667badc5e7608b69c533a119a2afc062e257)
-rw-r--r-- | src/init-ceph.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/init-ceph.in b/src/init-ceph.in index 31aeb287223..7344bf8f02b 100644 --- a/src/init-ceph.in +++ b/src/init-ceph.in @@ -298,8 +298,8 @@ for name in $what; do status) if daemon_is_running $name ceph-$type $id $pid_file; then get_conf asok "/var/run/ceph/ceph-$type.$id.asok" "admin socket" - version=`do_cmd "$BINDIR/ceph --admin-daemon $asok version 2>/dev/null" || echo unknown` - echo "$name: running $version" + echo -n "$name: running " + do_cmd "$BINDIR/ceph --admin-daemon $asok version 2>/dev/null" || echo unknown elif [ -e "$pid_file" ]; then # daemon is dead, but pid file still exists echo "$name: dead." |