]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "doc/dev: Running workunits locally" 45367/head
authorMatan Breizman <mbreizma@redhat.com>
Thu, 3 Mar 2022 10:23:48 +0000 (10:23 +0000)
committerMatan Breizman <mbreizma@redhat.com>
Sun, 13 Mar 2022 09:30:54 +0000 (09:30 +0000)
This reverts commit 7324abbe0122e02d11c09be4ea0f3899abc16bbd.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 67570c9bb18023bf1b5af27fff46737ff3c93caf)

src/vstart.sh

index 2573b364b9a94a9da22f331466ecf1c585c45aa8..7c305cf9642c190d5f5be6e9fce817ef504d37f7 100755 (executable)
@@ -1747,8 +1747,11 @@ echo ""
     echo "export PYTHONPATH=$PYBIND:$CYTHON_PYTHONPATH:$CEPH_PYTHON_COMMON\$PYTHONPATH"
     echo "export LD_LIBRARY_PATH=$CEPH_LIB:\$LD_LIBRARY_PATH"
     echo "export PATH=$CEPH_DIR/bin:\$PATH"
-    echo "export CEPH_CONF=$conf_fn"
-    echo "export CEPH_KEYRING=$keyring_fn"
+
+    if [ "$CEPH_DIR" != "$PWD" ]; then
+        echo "export CEPH_CONF=$conf_fn"
+        echo "export CEPH_KEYRING=$keyring_fn"
+    fi
 
     if [ -n "$CEPHFS_SHELL" ]; then
         echo "alias cephfs-shell=$CEPHFS_SHELL"