From: Michael Fritch <mfritch@suse.com>
Date: Thu, 18 Nov 2021 23:15:32 +0000 (-0700)
Subject: stop.sh: compile cephadm
X-Git-Tag: v18.0.0~7^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2713f6b93594090afc724398b34770015c9271c1;p=ceph.git

stop.sh: compile cephadm

use the path to the compiled cephadm binary file

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/stop.sh b/src/stop.sh
index 55abb7593307..dce34b6513f1 100755
--- a/src/stop.sh
+++ b/src/stop.sh
@@ -30,7 +30,10 @@ else
   CEPH_CONF_PATH="$PWD"
 fi
 conf_fn="$CEPH_CONF_PATH/ceph.conf"
-CEPHADM_DIR_PATH="$CEPH_CONF_PATH/../src/cephadm"
+
+if [ -z "$CEPHADM" ]; then
+  CEPHADM="${CEPH_BIN}/cephadm"
+fi
 
 MYUID=$(id -u)
 MYNAME=$(id -nu)
@@ -75,7 +78,7 @@ maybe_kill() {
 
 do_killcephadm() {
     FSID=$($CEPH_BIN/ceph -c $conf_fn fsid)
-    sudo $CEPHADM_DIR_PATH/cephadm rm-cluster --fsid $FSID --force
+    sudo $CEPHADM rm-cluster --fsid $FSID --force
 }
 
 do_umountall() {
@@ -189,7 +192,7 @@ if [ $stop_all -eq 1 ]; then
         fi
     fi
 
-    daemons="$(sudo $CEPHADM_DIR_PATH/cephadm ls 2> /dev/null)"
+    daemons="$(sudo $CEPHADM ls 2> /dev/null)"
     if [ $? -eq 0 -a "$daemons" != "[]" ]; then
         do_killcephadm
     fi