Skip to content

Commit f436973

Browse files
authored
Merge pull request ceph#45244 from Matan-B/wip-matanb-revert-keyring
Revert "doc/dev: Running workunits locally" Reviewed-by: Radoslaw Zarzynski <[email protected]>
2 parents 1187405 + 67570c9 commit f436973

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/vstart.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1758,8 +1758,11 @@ echo ""
17581758
echo "export PYTHONPATH=$PYBIND:$CYTHON_PYTHONPATH:$CEPH_PYTHON_COMMON\$PYTHONPATH"
17591759
echo "export LD_LIBRARY_PATH=$CEPH_LIB:\$LD_LIBRARY_PATH"
17601760
echo "export PATH=$CEPH_DIR/bin:\$PATH"
1761-
echo "export CEPH_CONF=$conf_fn"
1762-
echo "export CEPH_KEYRING=$keyring_fn"
1761+
1762+
if [ "$CEPH_DIR" != "$PWD" ]; then
1763+
echo "export CEPH_CONF=$conf_fn"
1764+
echo "export CEPH_KEYRING=$keyring_fn"
1765+
fi
17631766

17641767
if [ -n "$CEPHFS_SHELL" ]; then
17651768
echo "alias cephfs-shell=$CEPHFS_SHELL"

0 commit comments

Comments
 (0)