]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph_common: fix check for defined/undefined entities in conf
authorSage Weil <sage@inktank.com>
Sun, 17 Feb 2013 18:39:44 +0000 (10:39 -0800)
committerSage Weil <sage@inktank.com>
Sun, 17 Feb 2013 18:39:44 +0000 (10:39 -0800)
Signed-off-by: Sage Weil <sage@inktank.com>
src/ceph_common.sh

index fd3f72f381fc6dfb2c9cad9a73b159acc1306a60..47a21af85bd7dcbd81d0ca555a2a6178d84e38a3 100644 (file)
@@ -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"