Swap current dir (.) with CEPH_BIN for OOT builds

With out-of-tree builds, vstart.sh needs CEPH_BIN to be set, and
needs to look for init-ceph in CEPH_BIN rather than just ./init-ceph.

Signed-off-by: Sam Lang <sam.lang@inktank.com>

diff --git a/src/vstart.sh b/src/vstart.sh
index 691aeecad20dda8d2c952631c25dd9d7b641442e..67a4157afd3fd07cc6d133a3206dcece41638422 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -193,12 +193,15 @@ fi
 # lockdep everywhere?
 # export CEPH_ARGS="--lockdep 1"
 
+[ -z "$CEPH_BIN" ] && CEPH_BIN=.
+[ -z "$CEPH_PORT" ] && CEPH_PORT=6789
+
 
 # sudo if btrfs
 test -d dev/osd0/. && test -e dev/sudo && SUDO="sudo"
 
 if [ "$start_all" -eq 1 ]; then
-    $SUDO ./init-ceph stop
+    $SUDO $CEPH_BIN/init-ceph stop
 fi
 $SUDO rm -f core*
 
@@ -224,9 +227,6 @@ else
 fi
 echo "ip $IP"
 
-[ -z "$CEPH_BIN" ] && CEPH_BIN=.
-[ -z "$CEPH_PORT" ] && CEPH_PORT=6789
-
 
 
 if [ "$cephx" -eq 1 ]; then