Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: lib by sunjd from ([email protected])
2. Linux-HA CVS: lrm by sunjd from ([email protected])
3. Linux-HA CVS: mgmt by zhenh from
([email protected])
4. Linux-HA CVS: lib by sunjd from ([email protected])
5. Linux-HA CVS: lib by sunjd from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 16 May 2006 03:35:44 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/stonith/external
Modified Files:
ssh.in
Log Message:
make metadat be compliant to XML specification
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/external/ssh.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ssh.in 30 Nov 2005 02:28:37 -0000 1.8
+++ ssh.in 16 May 2006 09:35:44 -0000 1.9
@@ -127,17 +127,17 @@
;;
getinfo-xml)
cat << SSHXML
-"<parameters>"
-"<parameter name=\"hostlist\" unique=\"1\">"
-"<content type=\"string\" />"
-"<shortdesc lang=\"en\">"
-"Hostlist"
-"</shortdesc>"
-"<longdesc lang=\"en\">"
-"The list of hosts that the STONITH device controls"
-"</longdesc>"
-"</parameter>"
-"</parameters>"
+<parameters>
+<parameter name="hostlist" unique="1" required="1">
+<content type="string" />
+<shortdesc lang="en">
+Hostlist
+</shortdesc>
+<longdesc lang="en">
+The list of hosts that the STONITH device controls
+</longdesc>
+</parameter>
+</parameters>
SSHXML
exit 0
;;
------------------------------
Message: 2
Date: Tue, 16 May 2006 03:40:38 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/admin
Modified Files:
lrmadmin.c
Log Message:
fix a minor typo; remove the hint for metadata output
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/admin/lrmadmin.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- lrmadmin.c 15 May 2006 03:35:43 -0000 1.36
+++ lrmadmin.c 16 May 2006 09:40:37 -0000 1.37
@@ -1,4 +1,4 @@
-/* $Id: lrmadmin.c,v 1.36 2006/05/15 03:35:43 sunjd Exp $ */
+/* $Id: lrmadmin.c,v 1.37 2006/05/16 09:40:37 sunjd Exp $ */
/* File: lrmadmin.c
* Description: A adminstration tool for Local Resource Manager
*
@@ -115,7 +115,7 @@
" {-L|--listall}\n"
" {-I|--information} <rsc_id>\n"
" {-C|--raclass_supported}\n"
-" {-T|--ratype_supported} <raclss>\n"
+" {-T|--ratype_supported} <raclass>\n"
" {-M|--metadata} <raclass> <ratype> <provider|NULL>\n"
" {-P|--provider} <raclass> <ratype>\n"
" {-h|--help}\n";
@@ -629,7 +629,7 @@
metadata = lrmd->lrm_ops->get_rsc_type_metadata(lrmd, class, type,
provider);
if (NULL!=metadata) {
- printf ("metadata of %s(%s) is:\n %s\n",type,class,metadata);
+ printf ("%s\n", metadata);
g_free (metadata);
}
return 0;
@@ -939,6 +939,9 @@
/*
* $Log: lrmadmin.c,v $
+ * Revision 1.37 2006/05/16 09:40:37 sunjd
+ * fix a minor typo; remove the hint for metadata output
+ *
* Revision 1.36 2006/05/15 03:35:43 sunjd
* minor changes: typoes and formats
*
------------------------------
Message: 3
Date: Tue, 16 May 2006 03:46:48 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c
Log Message:
it looks that #default is better than default
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- mgmt_crm.c 12 May 2006 08:17:50 -0000 1.40
+++ mgmt_crm.c 16 May 2006 09:46:47 -0000 1.41
@@ -1301,8 +1301,7 @@
char prefix[MAX_STRLEN];
char suffix[MAX_STRLEN];
- if (STRNCMP_CONST(argv[2],"default") == 0 ||
- STRNCMP_CONST(argv[2],"Default") == 0) {
+ if (STRNCMP_CONST(argv[2],"#default") == 0) {
snprintf(buf, MAX_STRLEN,"%s_target_role", argv[1]);
rc = delete_object("resources", "nvpair", buf, &output);
if (rc < 0) {
------------------------------
Message: 4
Date: Tue, 16 May 2006 03:58:15 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/lrm
Modified Files:
raexeclsb.c
Log Message:
metadata template tweak
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/lrm/raexeclsb.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- raexeclsb.c 16 May 2006 08:09:27 -0000 1.45
+++ raexeclsb.c 16 May 2006 09:58:13 -0000 1.46
@@ -60,8 +60,7 @@
#define meta_data_template \
"<?xml version=\"1.0\"?>\n"\
"<!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n"\
-"<resource-agent name=%s"\
-"\" version=\"0.1\">\n"\
+"<resource-agent name=\"%s\" version=\"0.1\">\n"\
" <version>1.0</version>\n"\
" <longdesc lang=\"en\">\n"\
" %s"\
------------------------------
Message: 5
Date: Tue, 16 May 2006 04:20:53 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/lrm
Modified Files:
raexechb.c
Log Message:
metadata template tweak
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/lrm/raexechb.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- raexechb.c 15 May 2006 08:58:36 -0000 1.50
+++ raexechb.c 16 May 2006 10:20:53 -0000 1.51
@@ -46,43 +46,43 @@
static const char * RA_PATH = HB_RA_DIR;
-#define meta_data_template "\n"\
-"<?xml version=\"1.0\"?>\n"\
-"<!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n"\
-"<resource-agent name=%s"\
-"<version>1.0</version>\n"\
-"<longdesc lang=\"en\">\n"\
-"%s"\
-"</longdesc>\n"\
-"<shortdesc lang=\"en\">%s</shortdesc>\n"\
-"<parameters>\n"\
-"<parameter name=\"1\" unique=\"1\" required=\"0\">\n"\
-"<longdesc lang=\"en\">\n"\
-"This argument will be passed as the first argument to the"\
-"heartbeat resource agent (assuming it supports one)\n"\
-"</longdesc>\n"\
-"<shortdesc lang=\"en\">argv[1]</shortdesc>\n"\
-"<content type=\"string\" default=" " />\n"\
-"</parameter>\n"\
-"<parameter name=\"2\" unique=\"1\" required=\"0\">\n"\
-"<longdesc lang=\"en\">\n"\
-"This argument will be passed as the first argument to the"\
-"heartbeat resource agent (assuming it supports one)\n"\
-"</longdesc>\n"\
-"<shortdesc lang=\"en\">argv[2]</shortdesc>\n"\
-"<content type=\"string\" default=" " />\n"\
-"</parameter>\n"\
-"</parameters>\n"\
-"<actions>\n"\
-"<action name=\"start\" timeout=\"15\" />\n"\
-"<action name=\"stop\" timeout=\"15\" />\n"\
-"<action name=\"status\" timeout=\"15\" />\n"\
-"<action name=\"monitor\" timeout=\"15\" interval=\"15\" start-delay=\"15\"
/>\n"\
-"<action name=\"meta-data\" timeout=\"5\" />\n"\
-"</actions>\n"\
-"<special tag=\"heartbeart\">\n"\
-"</special>\n"\
-"</resource-agent>\n"
+static const char meta_data_template[] =
+"<?xml version=\"1.0\"?>\n"
+"<!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n"
+"<resource-agent name=\"%s\">\n"
+"<version>1.0</version>\n"
+"<longdesc lang=\"en\">\n"
+"%s"
+"</longdesc>\n"
+"<shortdesc lang=\"en\">%s</shortdesc>\n"
+"<parameters>\n"
+"<parameter name=\"1\" unique=\"1\" required=\"0\">\n"
+"<longdesc lang=\"en\">\n"
+"This argument will be passed as the first argument to the"
+"heartbeat resource agent (assuming it supports one)\n"
+"</longdesc>\n"
+"<shortdesc lang=\"en\">argv[1]</shortdesc>\n"
+"<content type=\"string\" default=\" \" />\n"
+"</parameter>\n"
+"<parameter name=\"2\" unique=\"1\" required=\"0\">\n"
+"<longdesc lang=\"en\">\n"
+"This argument will be passed as the first argument to the"
+"heartbeat resource agent (assuming it supports one)\n"
+"</longdesc>\n"
+"<shortdesc lang=\"en\">argv[2]</shortdesc>\n"
+"<content type=\"string\" default=\" \" />\n"
+"</parameter>\n"
+"</parameters>\n"
+"<actions>\n"
+"<action name=\"start\" timeout=\"15\" />\n"
+"<action name=\"stop\" timeout=\"15\" />\n"
+"<action name=\"status\" timeout=\"15\" />\n"
+"<action name=\"monitor\" timeout=\"15\" interval=\"15\" start-delay=\"15\"
/>\n"
+"<action name=\"meta-data\" timeout=\"5\" />\n"
+"</actions>\n"
+"<special tag=\"heartbeart\">\n"
+"</special>\n"
+"</resource-agent>\n";
/* The begin of exported function list */
static int execra(const char * rsc_id,
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 48
********************************************
