From: Kefu Chai <kchai@redhat.com>
Date: Tue, 17 Dec 2019 11:57:34 +0000 (+0800)
Subject: stop.sh: use ${CEPH_BIN} and -c ${conf_fn}
X-Git-Tag: v15.1.0~464^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32295%2Fhead;p=ceph.git

stop.sh: use ${CEPH_BIN} and -c ${conf_fn}

to make sure ${CEPH_BIN} and ${CEPH_CONF_PATH} are respected

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/stop.sh b/src/stop.sh
index 604255f4ae84..38d819415cb8 100755
--- a/src/stop.sh
+++ b/src/stop.sh
@@ -41,7 +41,7 @@ do_killall() {
 do_umountall() {
     #VSTART_IP_PORTS is of the format as below
     #"[v[num]:IP:PORT/0,v[num]:IP:PORT/0][v[num]:IP:PORT/0,v[num]:IP:PORT/0]..."
-    VSTART_IP_PORTS=$(bin/ceph mon metadata 2>/dev/null | jq -j '.[].addrs')
+    VSTART_IP_PORTS=$("${CEPH_BIN}"/ceph -c $conf_fn mon metadata 2>/dev/null | jq -j '.[].addrs')
 
     #SRC_MNT_ARRAY is of the format as below
     #SRC_MNT_ARRAY[0] = IP:PORT,IP:PORT,IP:PORT:/
@@ -64,7 +64,7 @@ do_umountall() {
     done
 
     #Get fuse mounts of the cluster
-    CEPH_FUSE_MNTS=$(bin/ceph tell mds.* client ls 2>/dev/null| grep mount_point | tr -d '",' | awk '{print $2}')
+    CEPH_FUSE_MNTS=$("${CEPH_BIN}"/ceph -c $conf_fn tell mds.* client ls 2>/dev/null | grep mount_point | tr -d '",' | awk '{print $2}')
     [ -n "$CEPH_FUSE_MNTS" ] && sudo umount -f $CEPH_FUSE_MNTS
 }