From: Sage Weil <sage@inktank.com>
Date: Fri, 19 Jul 2013 00:10:51 +0000 (-0700)
Subject: init-ceph: don't activate-all for vstart clusters
X-Git-Tag: v0.67-rc1~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ed7942997c7e401896be36d5b15b63e1586fffa;p=ceph.git

init-ceph: don't activate-all for vstart clusters

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 0ed906be9876..b0ed353f8e7f 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -431,7 +431,7 @@ for name in $what; do
 done
 
 # activate latent osds?
-if [ "$command" = "start" ]; then
+if [ "$command" = "start" -a "$BINDIR" != "." ]; then
     if [ "$*" = "" ] || echo $* | grep -q ^osd\$ ; then
 	ceph-disk activate-all
     fi