From 35c8c89258ec29598b3945299644afc938b5a7c1 Mon Sep 17 00:00:00 2001
From: Nizamudeen A <nia@redhat.com>
Date: Sun, 31 Jul 2022 20:55:44 +0530
Subject: [PATCH] mstart: make some mstart env variables configurable

Signed-off-by: Nizamudeen A <nia@redhat.com>
---
 src/mrun      | 2 +-
 src/mstart.sh | 6 +++---
 src/vstart.sh | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mrun b/src/mrun
index 0536e43fd1bbe..a85221800218b 100755
--- a/src/mrun
+++ b/src/mrun
@@ -6,7 +6,7 @@ root=`dirname $0`
 run_name=$1
 command=$2
 CEPH_BIN=""
-CEPH_CONF_PATH="/etc/ceph/"
+CEPH_CONF_PATH=${CEPH_CONF_PATH:-/etc/ceph/}
 
 [ -z "$BUILD_DIR" ] && BUILD_DIR=build
 
diff --git a/src/mstart.sh b/src/mstart.sh
index 4bf3bde4b69c7..34b57e1761125 100755
--- a/src/mstart.sh
+++ b/src/mstart.sh
@@ -49,9 +49,9 @@ pos=`echo $pos | cut -d: -f1`
 base_port=$((6800+pos*20))
 rgw_port=$((8000+pos*1))
 
-export VSTART_DEST=$RUN_ROOT_PATH/$instance
-export CEPH_PORT=$base_port
-export CEPH_RGW_PORT=$rgw_port
+[ -z "$VSTART_DEST" ] && export VSTART_DEST=$RUN_ROOT_PATH/$instance
+[ -z "$CEPH_PORT" ] && export CEPH_PORT=$base_port
+[ -z "$CEPH_RGW_PORT" ] && export CEPH_RGW_PORT=$rgw_port
 
 mkdir -p $VSTART_DEST
 
diff --git a/src/vstart.sh b/src/vstart.sh
index 51ebcf26cdbac..b4daa13e48780 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -36,8 +36,8 @@ if [ -n "$VSTART_DEST" ]; then
     SRC_PATH=`(cd $SRC_PATH; pwd)`
 
     CEPH_DIR=$SRC_PATH
-    CEPH_BIN=${PWD}/bin
-    CEPH_LIB=${PWD}/lib
+    CEPH_BIN=${CEPH_BIN:-${PWD}/bin}
+    CEPH_LIB=${CEPH_LIB:-${PWD}/lib}
 
     CEPH_CONF_PATH=$VSTART_DEST
     CEPH_DEV_DIR=$VSTART_DEST/dev
-- 
2.39.5