diff options
| author | Yehuda Sadeh <yehuda@hq.newdream.net> | 2009-02-27 15:46:10 -0800 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@hq.newdream.net> | 2009-02-27 15:46:10 -0800 |
| commit | c2e1fa50bf960bc4855d9eef9de1e5f6e2543dbb (patch) | |
| tree | f4d5b62c0b7870dc4c2645ae144c3c938daf3de8 /src/ceph_common.sh | |
| parent | 06572bbfbe182bb3d956e083cbe4efa37c5469ad (diff) | |
| download | ceph-c2e1fa50bf960bc4855d9eef9de1e5f6e2543dbb.tar.gz | |
ceph-daemons: works partially
Diffstat (limited to 'src/ceph_common.sh')
| -rw-r--r-- | src/ceph_common.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/ceph_common.sh b/src/ceph_common.sh index 26abaa3e987..653d7a5e856 100644 --- a/src/ceph_common.sh +++ b/src/ceph_common.sh @@ -1,11 +1,6 @@ -[ "$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"` + [ "$2" != "" ] && export $1=$2 || export $1=`$CCONF -c $conf "$3" "$4" "$5"` } get_val_bool() { @@ -33,7 +28,7 @@ get_conf() { tmp=$tmp" -s $1" shift done - eval $var=`$CCONF $tmp "$key" "$def"` + eval $var=`$CCONF -c $conf $tmp "$key" "$def"` } get_conf_bool() { |