RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

vstart,init-ceph: include build bin/ in $PATH

Browse Source 
This allows mgr/cephadm to run radosgw-admin.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2021-03-05 10:54:37 -05:00
parent cab87f956b
commit 1ad8811d1b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/init-ceph.in
View File

@ -36,6 +36,8 @@ else
ETCDIR=.
ASSUME_DEV=1
CEPH_LIB=$CEPH_ROOT/${BUILD_DIR}/lib
# mgr shells out to radosgw-admin; give it a proper path
export PATH=$BINDIR:$PATH
echo "$PYTHONPATH" | grep -q $CEPH_LIB || export PYTHONPATH=$CEPH_ROOT/src/pybind:$CEPH_LIB/cython_modules/lib.3:$CEPH_ROOT/src/python-common:$PYTHONPATH
echo "$LD_LIBRARY_PATH" | grep -q $CEPH_LIB || export LD_LIBRARY_PATH=$CEPH_LIB:$CEPH_ROOT/${BUILD_DIR}/external/lib:$LD_LIBRARY_PATH
echo "$DYLD_LIBRARY_PATH" | grep -q $CEPH_LIB || export DYLD_LIBRARY_PATH=$CEPH_LIB:$CEPH_ROOT/${BUILD_DIR}/external/lib:$DYLD_LIBRARY_PATH

4
src/vstart.sh
View File

@ -22,12 +22,12 @@ debug() {
prunb() {
debug quoted_print "$@" '&'
"$@" &
PATH=$CEPH_BIN:$PATH "$@" &
}
prun() {
debug quoted_print "$@"
"$@"
PATH=$CEPH_BIN:$PATH "$@"
}