]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart,init-ceph: include build bin/ in $PATH 44086/head
authorSage Weil <sage@newdream.net>
Fri, 5 Mar 2021 15:54:37 +0000 (10:54 -0500)
committerAlfonso Martínez <almartin@redhat.com>
Wed, 24 Nov 2021 14:56:17 +0000 (15:56 +0100)
This allows mgr/cephadm to run radosgw-admin.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 1ad8811d1b37ca5d46fd7ae807974e72c12d83a4)

 Conflicts:
src/init-ceph.in
    - Resolve conflicts.

src/init-ceph.in
src/vstart.sh

index bd4ddcf0e5a2f575ccf6d14190021c73a38d4f70..76f0d59c1d8a9f1575c2014d502a2d879605923b 100755 (executable)
@@ -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_LIB/cython_modules/lib.3:$PYTHONPATH
        echo "$LD_LIBRARY_PATH" | grep -q $CEPH_LIB || export LD_LIBRARY_PATH=$CEPH_LIB:$LD_LIBRARY_PATH
        echo "$DYLD_LIBRARY_PATH" | grep -q $CEPH_LIB || export DYLD_LIBRARY_PATH=$CEPH_LIB:$DYLD_LIBRARY_PATH
index f8e1f6d136862c279d0c2a640db4f12d716000cf..6044c346a1602030dd4c2f81a7f7a082fe11067c 100755 (executable)
@@ -22,12 +22,12 @@ debug() {
 
 prunb() {
     debug quoted_print "$@" '&'
-    "$@" &
+    PATH=$CEPH_BIN:$PATH "$@" &
 }
 
 prun() {
     debug quoted_print "$@"
-    "$@"
+    PATH=$CEPH_BIN:$PATH "$@"
 }