From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 8 Apr 2019 14:00:03 +0000 (-0400)
Subject: vstart: add an alias for cephfs-shell to vstart_environment.sh
X-Git-Tag: v15.1.0~3000^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27437%2Fhead;p=ceph.git

vstart: add an alias for cephfs-shell to vstart_environment.sh

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 1b0dfe8a6b0f..508f613a6c0c 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -48,6 +48,7 @@ if [ -n "$CEPH_BUILD_ROOT" ]; then
         [ -z "$OBJCLASS_PATH" ] && OBJCLASS_PATH=$CEPH_LIB/rados-classes
         # make install should install python extensions into PYTHONPATH
 elif [ -n "$CEPH_ROOT" ]; then
+	[ -z "$CEPHFS_SHELL" ] && CEPHFS_SHELL=$CEPH_ROOT/src/tools/cephfs/cephfs-shell
         [ -z "$PYBIND" ] && PYBIND=$CEPH_ROOT/src/pybind
         [ -z "$CEPH_BIN" ] && CEPH_BIN=$CEPH_BUILD_DIR/bin
         [ -z "$CEPH_ADM" ] && CEPH_ADM=$CEPH_BIN/ceph
@@ -1250,6 +1251,10 @@ echo ""
         echo "export CEPH_CONF=$conf_fn"
         echo "export CEPH_KEYRING=$keyring_fn"
     fi
+
+    if [ -n "$CEPHFS_SHELL" ]; then
+	    echo "alias cephfs-shell=$CEPHFS_SHELL"
+    fi
 } | tee -a $CEPH_DIR/vstart_environment.sh
 
 echo "CEPH_DEV=1"