From: Sage Weil <sage@inktank.com>
Date: Sun, 17 Feb 2013 18:39:44 +0000 (-0800)
Subject: ceph_common: fix check for defined/undefined entities in conf
X-Git-Tag: v0.58~46
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28e7212d38cbe88e737173e6c9ccef3f1bb5316f;p=ceph.git

ceph_common: fix check for defined/undefined entities in conf

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

diff --git a/src/ceph_common.sh b/src/ceph_common.sh
index fd3f72f381fc..47a21af85bd7 100644
--- a/src/ceph_common.sh
+++ b/src/ceph_common.sh
@@ -165,8 +165,8 @@ get_name_list() {
 		what=`echo $allconf $local | grep ^$type || true`
 		;;
 	    *)
-		if echo " " "$allconf" "$local" " " | egrep -v -q "( $type$id | $type.$id )"; then
-		    echo "$0: $type.$id not found ($conf defines \"$all\", /var/lib/ceph defines \"$local\")"
+		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"