ceph-daemon: remove guesswork to find script file

Allow passing CEPH_DAEMON via the environment or default to using the
script from the standard location.

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

diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh
index 1aa0f36a3ec6c1a19005d508615d7afc3b6598b8..69eaf434e1b90b0675f61d50850c51b056d3c9cf 100755 (executable)
--- a/qa/standalone/test_ceph_daemon.sh
+++ b/qa/standalone/test_ceph_daemon.sh
@@ -22,16 +22,12 @@ OSD_LV_NAME=${SCRIPT_NAME%.*}
 [ -z "$SUDO" ] && SUDO=sudo
 
 if [ -z "$CEPH_DAEMON" ]; then
-    [ -x src/ceph-daemon/ceph-daemon ] && CEPH_DAEMON=src/ceph-daemon/ceph-daemon
-    [ -x ../src/ceph-daemon/ceph-daemon ] && CEPH_DAEMON=../src/ceph-daemon/ceph-daemon
-    [ -x ./ceph-daemon/ceph-daemon ] && CEPH_DAEMON=./ceph-daemon/ceph-daemon
-    [ -x ./ceph-daemon ] && CEPH_DAEMON=.ceph-daemon
-    which ceph-daemon && CEPH_DAEMON=$(which ceph-daemon)
+    CEPH_DAEMON=${SCRIPT_DIR}/../../src/ceph-daemon/ceph-daemon
 fi
 
 # at this point, we need $CEPH_DAEMON set
-if [ -z "$CEPH_DAEMON" ]; then
-    echo "ceph-daemon not found.Please set \$CEPH_DAEMON"
+if ! [ -x "$CEPH_DAEMON" ]; then
+    echo "ceph-daemon not found. Please set \$CEPH_DAEMON"
     exit 1
 fi