[Cluster-devel] cluster/cman/cman_tool join.c
pcaulfield at sourceware.org
pcaulfield at sourceware.org
Wed Jan 30 16:06:07 UTC 2008
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 */
More information about the Cluster-devel
mailing list