From: Orit Wasserman <owasserm@redhat.com>
Date: Mon, 14 Dec 2015 11:47:44 +0000 (+0100)
Subject: ajdust mstart and mstop script to run with cmake build
X-Git-Tag: v10.1.0~398^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c287fea098e726885c5e369c83748f616ea90e63;p=ceph.git

ajdust mstart and mstop script to run with cmake build

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/mstart.sh b/src/mstart.sh
index b67c1806ad7..0f344ba5d14 100755
--- a/src/mstart.sh
+++ b/src/mstart.sh
@@ -13,8 +13,14 @@ usage_exit() {
 instance=$1
 shift
 
+vstart_path=`dirname $0`
+
 root_path=`dirname $0`
 root_path=`(cd $root_path; pwd)`
+
+if [ -e CMakeCache.txt ]; then
+    root_path=$PWD
+fi
 RUN_ROOT_PATH=${root_path}/run
 CLUSTERS_LIST=$RUN_ROOT_PATH/.clusters.list
 
@@ -42,4 +48,4 @@ mkdir -p $VSTART_DEST
 echo "Cluster dest path: $VSTART_DEST"
 echo "monitors base port: $CEPH_PORT"
 
-$root_path/vstart.sh "$@"
+$vstart_path/vstart.sh "$@"
diff --git a/src/mstop.sh b/src/mstop.sh
index 7fb971bd00a..0f85482f684 100755
--- a/src/mstop.sh
+++ b/src/mstop.sh
@@ -4,6 +4,10 @@ set -e
 
 script_root=`dirname $0`
 
+if [ -e CMakeCache.txt ]; then
+    script_root=$PWD
+fi
+
 [ "$#" -lt 1 ] && echo "usage: $0 <name> [entity [id]]" && exit 1
 
 name=$1
diff --git a/src/vstart.sh b/src/vstart.sh
index daf4d7db30d..758629f8222 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -10,6 +10,12 @@ if [ -n "$VSTART_DEST" ]; then
   CEPH_DIR=$SRC_PATH
   CEPH_BIN=$SRC_PATH
   CEPH_LIB=$SRC_PATH/.libs
+
+  if [ -e CMakeCache.txt ]; then
+      CEPH_BIN=$VSTART_DEST/../../src
+      CEPH_LIB=$CEPH_BIN
+  fi
+
   CEPH_CONF_PATH=$VSTART_DEST
   CEPH_DEV_DIR=$VSTART_DEST/dev
   CEPH_OUT_DIR=$VSTART_DEST/out