From 23ffd9731592f0e5e629bd93977f8b99fed8ff56 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 5 Mar 2021 10:54:37 -0500
Subject: [PATCH] vstart,init-ceph: include build bin/ in $PATH

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 | 2 ++
 src/vstart.sh    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/init-ceph.in b/src/init-ceph.in
index bd4ddcf0e5a2f..76f0d59c1d8a9 100755
--- 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_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
diff --git a/src/vstart.sh b/src/vstart.sh
index f8e1f6d136862..6044c346a1602 100755
--- 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 "$@"
 }
 
 
-- 
2.39.5