cluster: STABLE3 - fence-agents: fix fence_xvm metadata again

Lon Hohberger lon at fedoraproject.org
Thu Nov 19 15:20:15 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a560097e32ea6094858ff8a8743c060df9f210f5
Commit:        a560097e32ea6094858ff8a8743c060df9f210f5
Parent:        430ebae6ec08628b24ccc8f0f1038a923a20f21d
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Thu Nov 19 10:13:19 2009 -0500
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Thu Nov 19 10:13:19 2009 -0500

fence-agents: fix fence_xvm metadata again

The 'option' parameter should no longer be used
or documented; only supported in upgrade situations.

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 fence/agents/xvm/options.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/fence/agents/xvm/options.c b/fence/agents/xvm/options.c
index 78ff013..c0914a5 100644
--- a/fence/agents/xvm/options.c
+++ b/fence/agents/xvm/options.c
@@ -350,11 +350,16 @@ static struct arg_info _arg_info[] = {
 	  "Shared key file (default=" DEFAULT_KEY_FILE ")",
 	  assign_key },
 
-	{ 'o', "-o <operation>", "option",
+	{ '\xff', NULL, "option",
 	  0, "string", "reboot",
 	  "Fencing operation (null, off, [reboot])",
 	  assign_op },
 
+	{ 'o', "-o <action>", "action",
+	  0, "string", "reboot",
+	  "Fencing action (null, off, [reboot])",
+	  assign_op },
+
 	{ 'H', "-H <domain>", "domain",
 	  1, "string", NULL,
 	  "Virtual machine (domain name) to fence",


More information about the cluster-commits mailing list