cluster: STABLE3 - CMAN: Support for openaisserviceenablestable service loader

cluster: STABLE3 - CMAN: Support for openaisserviceenablestable service loader

[Jan Friesse]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ee551c4cfdc5d56cf5a5eae9ec98222b82047069
Commit:        ee551c4cfdc5d56cf5a5eae9ec98222b82047069
Parent:        d58d6c204132550fe725e95b368b0f507785fae6
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:55:57 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 219965e..eaea597 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 914e709..39d5f5a 100644
--- a/cman/man/cman_tool.8
+++ b/cman/man/cman_tool.8
@@ -289,7 +289,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