From: Sage Weil <sage@inktank.com>
Date: Fri, 22 Feb 2013 01:29:58 +0000 (-0800)
Subject: ceph_common.sh: fix iteration of items in ceph.conf
X-Git-Tag: v0.58~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd007db3ca27627d6a3017c436b6745084288ee5;p=ceph.git

ceph_common.sh: fix iteration of items in ceph.conf

This broke in c8f528a4070dd3aa0b25c435c6234032aee39b21.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/ceph_common.sh b/src/ceph_common.sh
index 47a21af85bd7..af2576b3cd49 100644
--- a/src/ceph_common.sh
+++ b/src/ceph_common.sh
@@ -144,7 +144,7 @@ get_local_name_list() {
 }
 
 get_name_list() {
-    orig=$1
+    orig="$*"
 
     # extract list of monitors, mdss, osds defined in startup.conf
     allconf=`$CCONF -c $conf -l mon | egrep -v '^mon$' ; \
@@ -162,14 +162,14 @@ get_name_list() {
 	id=`echo $f | cut -c 4- | sed 's/\\.//'`
 	case $f in
 	    mon | osd | mds)
-		what=`echo $allconf $local | grep ^$type || true`
+		what="$what "`echo "$allconf" "$local" | grep ^$type || true`
 		;;
 	    *)
 		if ! echo " " $allconf $local " " | egrep -q "( $type$id | $type.$id )"; then
 		    echo "$0: $type.$id not found ($conf defines" $allconf", /var/lib/ceph defines" $local")"
 		    exit 1
 		fi
-		what="$f"
+		what="$what $f"
 		;;
 	esac
     done