From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 25 Jan 2018 23:38:54 +0000 (-0800)
Subject: vstart: fixes for mstart
X-Git-Tag: v13.1.0~270^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b09fcde5b3c135a2fe484628e2b30e5ad6b96532;p=ceph.git

vstart: fixes for mstart

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 878730ae4cfd..638965dfcf4d 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -14,6 +14,7 @@ if [ -n "$VSTART_DEST" ]; then
   CEPH_CONF_PATH=$VSTART_DEST
   CEPH_DEV_DIR=$VSTART_DEST/dev
   CEPH_OUT_DIR=$VSTART_DEST/out
+  CEPH_ASOK_DIR=$VSTART_DEST/out
 fi
 
 get_cmake_variable() {
@@ -360,7 +361,9 @@ else
             CEPH_ASOK_DIR=`mktemp -u -d "${TMPDIR:-/tmp}/ceph-asok.XXXXXX"`
         fi
     else
-        CEPH_ASOK_DIR=`dirname $($CEPH_BIN/ceph-conf -c $conf_fn --show-config-value admin_socket)`
+	if [ -z "$CEPH_ASOK_DIR" ]; then
+            CEPH_ASOK_DIR=`dirname $($CEPH_BIN/ceph-conf -c $conf_fn --show-config-value admin_socket)`
+        fi
         # -k is implied... (doesn't make sense otherwise)
         overwrite_conf=0
     fi