ceph.sh: try to locate cconf

diff --git a/src/common.sh b/src/common.sh
index 39d73ac1e1f442fa13e8047f2319ff773438158f..26abaa3e987dcabae919aa6d8ca9c04023dbc08c 100644 (file)
--- a/src/common.sh
+++ b/src/common.sh
@@ -1,7 +1,8 @@
 
-[ "$CCONF_BIN" == "" ] && CCONF_BIN=`dirname $0`/../bin/cconf
-
+[ "$CCONF_BIN" == "" ] && CCONF_BIN=$CEPH_BIN/cconf
+[ -e $CCONF_BIN ] || CCONF_BIN=`dirname $0`/../bin/cconf
 [ -e $CCONF_BIN ] || CCONF_BIN=`dirname $0`/cconf
+[ -e $CCONF_BIN ] || CCONF_BIN=bin/cconf
 
 get_val() {
   [ "$2" != "" ] && export $1=$2 || export $1=`$CCONF "$3" "$4" "$5"`