cluster: STABLE3 - cman init: fix debugging vs relax ng output at startup

Fabio M. Di Nitto fabbione at fedoraproject.org
Wed Oct 21 06:25:24 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b7205d27c126a4e12aab19026a433a1bafd19f7c
Commit:        b7205d27c126a4e12aab19026a433a1bafd19f7c
Parent:        b1ac9397a2e27c2862cf41df7ac523c9982b65cf
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Wed Oct 21 08:24:19 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Wed Oct 21 08:24:19 2009 +0200

cman init: fix debugging vs relax ng output at startup

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 cman/init.d/cman.in |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index d03e33d..a58efaf 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -535,10 +535,12 @@ start_cman()
 		errmsg="$(cat $tmpfile)"
 		ret=1
 	else
-		ret=0
-		if [ "$CONFIG_VALIDATION" = "WARN" ] && [ -s $tmpfile ]; then
+		if [ "$CONFIG_VALIDATION" = "WARN" ] && \
+		   [ -s $tmpfile ] && \
+		   grep -q Relax-NG $tmpfile ; then
 			cat $tmpfile >&2
 		fi
+		ret=0
 	fi
 
 	rm -f $tmpfile


More information about the cluster-commits mailing list