cluster: master - CMAN: Support for openaisserviceenablestable service loader

cluster: master - CMAN: Support for openaisserviceenablestable service loader

[Jan Friesse]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=bd6b6c98d717447b4f1cc6746cd19929bc8352fb
Commit:        bd6b6c98d717447b4f1cc6746cd19929bc8352fb
Parent:        fd47fd5c3395467b517090f11d676bc52dba77ab
Author:        Jan Friesse <jfriesse@redhat.com>
AuthorDate:    Tue May 26 09:54:50 2009 +0200
Committer:     Jan Friesse <jfriesse@redhat.com>
CommitterDate: Tue May 26 09:54:50 2009 +0200

CMAN: Support for openaisserviceenablestable service loader

This reflect OpenAIS upstream change, where openaisserviceenable
is no longer exists. Openaisserviceenablestable load same
services, but without AMF, which is not stable.
---
 cman/cman_tool/join.c |    4 ++--
 cman/man/cman_tool.8  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cman/cman_tool/join.c b/cman/cman_tool/join.c
index 86a69c2..9c6ec5c 100644
--- a/cman/cman_tool/join.c
+++ b/cman/cman_tool/join.c
@@ -172,12 +172,12 @@ int join(commandline_t *comline, char *main_envp[])
 	if (comline->noconfig_opt) {
 		envp[envptr++] = strdup("CMAN_NOCONFIG=true");
 		snprintf(scratch, sizeof(scratch), "COROSYNC_DEFAULT_CONFIG_IFACE=cmanpreconfig%s",
-			 comline->noopenais_opt?"":":openaisserviceenable");
+			 comline->noopenais_opt?"":":openaisserviceenablestable");
 		envp[envptr++] = strdup(scratch);
 	}
 	else {
 		snprintf(scratch, sizeof(scratch), "COROSYNC_DEFAULT_CONFIG_IFACE=%s:cmanpreconfig%s", comline->config_lcrso,
-			 comline->noopenais_opt?"":":openaisserviceenable");
+			 comline->noopenais_opt?"":":openaisserviceenablestable");
 		envp[envptr++] = strdup(scratch);
 	}
 
diff --git a/cman/man/cman_tool.8 b/cman/man/cman_tool.8
index 4cd60a5..8160a9b 100644
--- a/cman/man/cman_tool.8
+++ b/cman/man/cman_tool.8
@@ -280,7 +280,7 @@ then -C will be ignored.
 .TP
 .I -A
 Don't load openais services. Normally cman_tool join will load the configuration
-module 'openaisserviceenable' which will load the services installed by openais.
+module 'openaisserviceenablestable' which will load the services installed by openais.
 If you don't want to use these services or have not installed openais then
 this switch will disable them.
 .SH "NODES" OPTIONS