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

This allows mgr/cephadm to run radosgw-admin.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 1910fa0eff9c838f8f284faa7dd0e9579e9ce2f0..f60c59293181d67ef3833600dd87407c562392cd 100755 (executable)
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -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

diff --git a/src/vstart.sh b/src/vstart.sh
index ee898e6c68e5af7c8f0a80e949cc2d1fe0d4d0f2..4037cf1829b7889d0980cfa71bff2e6df16b6a4f 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -22,12 +22,12 @@ debug() {
 
 prunb() {
     debug quoted_print "$@" '&'
-    "$@" &
+    PATH=$CEPH_BIN:$PATH "$@" &
 }
 
 prun() {
     debug quoted_print "$@"
-    "$@"
+    PATH=$CEPH_BIN:$PATH "$@"
 }