From: John Spray <john.spray@redhat.com>
Date: Tue, 4 Aug 2015 10:12:33 +0000 (+0100)
Subject: vstart: detect CEPH_BIN in stop.sh too
X-Git-Tag: v9.1.0~394^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c747e29a668002c9a01e41380bbcc81a411b05bb;p=ceph.git

vstart: detect CEPH_BIN in stop.sh too

...for the benefit of rbd.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/stop.sh b/src/stop.sh
index 8e45f4116d34..ea5f2737e617 100755
--- a/src/stop.sh
+++ b/src/stop.sh
@@ -18,7 +18,11 @@
 
 test -d dev/osd0/. && test -e dev/sudo && SUDO="sudo"
 
-[ -z "$CEPH_BIN" ] && CEPH_BIN=.
+if [ -e CMakeCache.txt ]; then
+  [ -z "$CEPH_BIN" ] && CEPH_BIN=src
+else
+  [ -z "$CEPH_BIN" ] && CEPH_BIN=.
+fi
 
 MYUID=$(id -u)
 MYNAME=$(id -nu)