From mboxrd@z Thu Jan  1 00:00:00 1970
From: pcaulfield@sourceware.org <pcaulfield@sourceware.org>
Date: 30 Jan 2008 16:06:07 -0000
Subject: [Cluster-devel] cluster/cman/cman_tool join.c
Message-ID: <20080130160607.32051.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2008-01-30 16:06:07

Modified files:
	cman/cman_tool : join.c 

Log message:
	Oops. a bit too much cman3 fell into that last checkin

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/join.c.diff?cvsroot=cluster&r1=1.54&r2=1.55

--- cluster/cman/cman_tool/join.c	2008/01/30 15:46:41	1.54
+++ cluster/cman/cman_tool/join.c	2008/01/30 16:06:07	1.55
@@ -121,12 +121,11 @@
 	}
 	if (comline->noccs_opt) {
 		envp[envptr++] = strdup("CMAN_NOCCS=true");
-		envp[envptr++] = strdup("OPENAIS_DEFAULT_CONFIG_IFACE=cmanpreconfig");
-	}
-	else {
-		envp[envptr++] = strdup("OPENAIS_DEFAULT_CONFIG_IFACE=cmanconfig");
 	}
 
+	/* Use cman to configure services */
+	envp[envptr++] = strdup("OPENAIS_DEFAULT_CONFIG_IFACE=cmanconfig");
+
 	/* Create a pipe to monitor cman startup progress */
 	pipe(p);
 	fcntl(p[1], F_SETFD, 0); /* Don't close on exec */