]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart: detect CEPH_BIN in stop.sh too 5457/head
authorJohn Spray <john.spray@redhat.com>
Tue, 4 Aug 2015 10:12:33 +0000 (11:12 +0100)
committerJohn Spray <john.spray@redhat.com>
Mon, 10 Aug 2015 13:09:00 +0000 (14:09 +0100)
...for the benefit of rbd.

Signed-off-by: John Spray <john.spray@redhat.com>
src/stop.sh

index 8e45f4116d34e7234c78f3b3cde805cafcf20eb7..ea5f2737e617146bb3a52a3f9435bd4c5e14309a 100755 (executable)
 
 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)