diff options
| author | Colin Patrick McCabe <cmccabe@alumni.cmu.edu> | 2011-03-10 07:41:50 -0800 |
|---|---|---|
| committer | Colin Patrick McCabe <cmccabe@alumni.cmu.edu> | 2011-03-10 07:49:03 -0800 |
| commit | 8e3abf3ce337ac4ac58d2d4f68fbedf5c3918175 (patch) | |
| tree | f1f2e8e129f93ce589662ee55a4fb1d265b8cf00 /src/ceph_common.sh | |
| parent | 33d6251a5a4a64ecaf9af7c38b57ed006b13a096 (diff) | |
| download | ceph-8e3abf3ce337ac4ac58d2d4f68fbedf5c3918175.tar.gz | |
Don't use -i to set id for non-daemons
Due to conflicts, don't use -i to set id except for daemons.
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Diffstat (limited to 'src/ceph_common.sh')
| -rw-r--r-- | src/ceph_common.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ceph_common.sh b/src/ceph_common.sh index 99c6e8f5456..36f1cdd90a8 100644 --- a/src/ceph_common.sh +++ b/src/ceph_common.sh @@ -45,7 +45,7 @@ verify_conf() { check_host() { # what host is this daemon assigned to? - host=`$CCONF -c $conf -i $id -t $type host` + host=`$CCONF -c $conf --name $type.$id host` [ "$host" = "localhost" ] && host="" ssh="" rootssh="" @@ -146,8 +146,8 @@ get_conf() { key=$3 shift; shift; shift - [ "$verbose" -eq 1 ] && echo "$CCONF -c $conf -i $id -t $type \"$key\"" - eval "$var=\"`$CCONF -c $conf -i $id -t $type \"$key\" || eval echo -n \"$def\"`\"" + [ "$verbose" -eq 1 ] && echo "$CCONF -c $conf --name $type.$id \"$key\"" + eval "$var=\"`$CCONF -c $conf --name $type.$id \"$key\" || eval echo -n \"$def\"`\"" } get_conf_bool() { |