From b99b55ab728df42a4cf6c046b85233c16e501189 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 17 Dec 2019 19:57:34 +0800 Subject: [PATCH] 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 --- src/stop.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 } -- 2.47.3