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: cts by gshi from ([email protected])
2. Linux-HA CVS: lib by gshi from ([email protected])
3. Linux-HA CVS: lib by sunjd from ([email protected])
4. Linux-HA CVS: lib by sunjd from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 17 May 2006 16:58:35 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CTSlab.py.in
Log Message:
remove extra "
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTSlab.py.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- CTSlab.py.in 16 May 2006 16:31:21 -0000 1.65
+++ CTSlab.py.in 17 May 2006 22:58:34 -0000 1.66
@@ -81,8 +81,8 @@
self.rsc_id = 'my_stonithd_id'
- self.command = ""@SSH@ -l root -n -x"
- self.command_noblock = ""@SSH@ -f -l root -n -x"
+ self.command = "@SSH@ -l root -n -x"
+ self.command_noblock = "@SSH@ -f -l root -n -x"
self.stonithd_started_nodes = []
self.fail_reason = ''
------------------------------
Message: 2
Date: Wed, 17 May 2006 17:22:34 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
cl_msg.c cl_msg_types.c
Log Message:
a compressed field can still be coded as a string, e.g in serial
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/cl_msg.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- cl_msg.c 9 May 2006 06:34:05 -0000 1.104
+++ cl_msg.c 17 May 2006 23:22:33 -0000 1.105
@@ -1,4 +1,4 @@
-/* $Id: cl_msg.c,v 1.104 2006/05/09 06:34:05 andrew Exp $ */
+/* $Id: cl_msg.c,v 1.105 2006/05/17 23:22:33 gshi Exp $ */
/*
* Heartbeat messaging object.
*
@@ -2208,7 +2208,7 @@
if (!tostring ||
(truelen = tostring(bp, maxp, m->values[j], m->vlens[j],
depth))
< 0){
- cl_log(LOG_ERR, "tostring failed");
+ cl_log(LOG_ERR, "tostring failed for field %d", j);
return HA_FAIL;
}
@@ -2479,6 +2479,9 @@
#endif
/*
* $Log: cl_msg.c,v $
+ * Revision 1.105 2006/05/17 23:22:33 gshi
+ * a compressed field can still be coded as a string, e.g in serial
+ *
* Revision 1.104 2006/05/09 06:34:05 andrew
* Support a generic replace operation on HA_Message objects
* Use it to preserve the internal XML ordering (which makes DTD validation
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/cl_msg_types.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- cl_msg_types.c 7 Apr 2006 13:07:13 -0000 1.36
+++ cl_msg_types.c 17 May 2006 23:22:33 -0000 1.37
@@ -1704,8 +1704,8 @@
string2list, netstring2list, NULL, NULL},
{binary_memfree, binary_dup, compress_display, add_compress_field,
- binary_stringlen,binary_netstringlen, NULL ,fields2netstring,
- NULL , netstring2binary, NULL, compress2uncompress}, /*FT_COMPRESS*/
+ binary_stringlen,binary_netstringlen, binary2string
,fields2netstring,
+ string2binary , netstring2binary, NULL, compress2uncompress},
/*FT_COMPRESS*/
{struct_memfree, struct_dup, uncompress_display,
add_uncompress_field,
struct_stringlen, struct_netstringlen, NULL , fields2netstring,
------------------------------
Message: 3
Date: Wed, 17 May 2006 20:50:20 -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
Modified Files:
rps10.c
Log Message:
- Fix the parameter name
- Make the metadata compliant to XML
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/rps10.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- rps10.c 16 May 2006 09:01:51 -0000 1.25
+++ rps10.c 18 May 2006 02:50:19 -0000 1.26
@@ -1,4 +1,4 @@
-/* $Id: rps10.c,v 1.25 2006/05/16 09:01:51 sunjd Exp $ */
+/* $Id: rps10.c,v 1.26 2006/05/18 02:50:19 sunjd Exp $ */
/*
* Stonith module for WTI Remote Power Controllers (RPS-10M device)
*
@@ -35,7 +35,7 @@
#define PIL_PLUGIN_S "rps10"
#define PIL_PLUGINLICENSE LICENSE_LGPL
#define PIL_PLUGINLICENSEURL URL_LGPL
-#define ST_RPS10 "<serial_device> <node> <outlet> [
<node> <outlet> ]..."
+#define ST_RPS10 "serial_to_targets"
#define MAX_PRSID 256
#include <pils/plugin.h>
@@ -186,12 +186,12 @@
#define XML_RPS10_SHORTDESC \
XML_PARM_SHORTDESC_BEGIN("en") \
- ST_RPS10 \
+ "Value in the format \"serial_device remotenode outlet [remotenode
outlet]...\"" \
XML_PARM_SHORTDESC_END
#define XML_RPS10_LONGDESC \
XML_PARM_LONGDESC_BEGIN("en") \
- "The RPS-10 STONITH device configuration information in the format
\"<serial_device> <remotenode> <outlet> [<remotenode> <outlet>]...\"" \
+ "The RPS-10 STONITH device configuration information in the format
\"serial_device remotenode outlet [remotenode outlet]...\"" \
XML_PARM_LONGDESC_END
#define XML_RPS10_PARM \
------------------------------
Message: 4
Date: Wed, 17 May 2006 21:30:38 -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:
relax the stickness to some LSB initscript standard; matching pattern name tweak
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/lrm/raexeclsb.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- raexeclsb.c 16 May 2006 09:58:13 -0000 1.46
+++ raexeclsb.c 18 May 2006 03:30:38 -0000 1.47
@@ -89,8 +89,8 @@
"</resource-agent>\n"
/* The keywords for lsb-compliant comment */
-#define LSB_INITSCRIPT_BEGIN_TAG "### BEGIN INIT INFO"
-#define LSB_INITSCRIPT_END_TAG "### END INIT INFO"
+#define LSB_INITSCRIPT_INFOBEGIN_TAG "### BEGIN INIT INFO"
+#define LSB_INITSCRIPT_INFOEND_TAG "### END INIT INFO"
#define PROVIDES "# Provides:"
#define REQ_START "# Required-Start:"
#define REQ_STOP "# Required-Stop:"
@@ -341,30 +341,40 @@
} else {
next_continue = FALSE;
}
- /* Shorte the search time */
+ /* Shorten the search time */
if (buffer[0] != '#' && buffer[0] != ' '
&& buffer[0] != '\n') {
break; /* donnot find */
}
if (found_begin_tag == TRUE && 0 == strncasecmp(buffer
- , LSB_INITSCRIPT_END_TAG
- , strlen(LSB_INITSCRIPT_END_TAG)) ) {
+ , LSB_INITSCRIPT_INFOEND_TAG
+ , strlen(LSB_INITSCRIPT_INFOEND_TAG)) ) {
is_lsb_script = TRUE;
break;
}
if (found_begin_tag == FALSE && 0 == strncasecmp(buffer
- , LSB_INITSCRIPT_BEGIN_TAG
- , strlen(LSB_INITSCRIPT_BEGIN_TAG)) ) {
+ , LSB_INITSCRIPT_INFOBEGIN_TAG
+ , strlen(LSB_INITSCRIPT_INFOBEGIN_TAG)) ) {
found_begin_tag = TRUE;
}
}
fclose(fp);
tmp = g_list_next(cur);
+
+/*
+ * Temporarily remove the filter to the initscript, or many initscripts on
+ * many distros, such as RHEL4 and fedora5, cannot be used by management GUI.
+ * Please refer to the bug
+ * http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=1250
+ */
+
+#if 0
if ( is_lsb_script != TRUE ) {
*rsc_info = g_list_remove(*rsc_info, cur->data);
g_free(cur->data);
}
+#endif
cur = tmp;
}
@@ -471,6 +481,14 @@
meta_data = g_string_new("");
next_continue = FALSE;
+
+/*
+ * Is not stick to the rule that the description should be located in the
+ * comment block between "### BEGIN INIT INFO" and "### END INIT INFO".
+ * Please refer to the bug
+ * http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=1250
+ */
+#if 0
while (NULL != fgets(buffer, BUFLEN, fp)) {
/* Handle the lines over BUFLEN(80) columns, only
* the first part is compared.
@@ -484,11 +502,12 @@
next_continue = FALSE;
}
- if ( 0 == strncasecmp(buffer , LSB_INITSCRIPT_BEGIN_TAG
- , strlen(LSB_INITSCRIPT_BEGIN_TAG)) ) {
+ if ( 0 == strncasecmp(buffer , LSB_INITSCRIPT_INFOBEGIN_TAG
+ , strlen(LSB_INITSCRIPT_INFOBEGIN_TAG)) ) {
break;
}
}
+#endif
/* Enter into the lsb-compliant comment block */
while ( NULL != fgets(buffer, BUFLEN, fp) ) {
@@ -526,11 +545,15 @@
continue;
}
- if ( 0 == strncasecmp(buffer, LSB_INITSCRIPT_END_TAG
- , strlen(LSB_INITSCRIPT_END_TAG)) ) {
+ if ( 0 == strncasecmp(buffer, LSB_INITSCRIPT_INFOEND_TAG
+ , strlen(LSB_INITSCRIPT_INFOEND_TAG)) ) {
/* Get to the out border of LSB comment block */
break;
}
+
+ if ( buffer[0] != '#' ) {
+ break; /* Out of comment block in the beginning */
+ }
}
fclose(fp);
------------------------------
_______________________________________________
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 55
********************************************
