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 andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 31 Mar 2006 05:45:05 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
xml.c
Log Message:
Revert the patch to unpack.c... start should never be called when a resource
is in master mode.
Have the sorting in calculate_xml_digest() optional
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- xml.c 31 Mar 2006 11:50:24 -0000 1.62
+++ xml.c 31 Mar 2006 12:45:02 -0000 1.63
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.62 2006/03/31 11:50:24 andrew Exp $ */
+/* $Id: xml.c,v 1.63 2006/03/31 12:45:02 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2289,7 +2289,7 @@
typedef struct name_value_s
{
const char *name;
- const char *value;
+ const void *value;
} name_value_t;
static gint
@@ -2363,14 +2363,21 @@
/* "c048eae664dba840e1d2060f00299e9d" */
char *
-calculate_xml_digest(crm_data_t *input)
+calculate_xml_digest(crm_data_t *input, gboolean sort)
{
int i = 0;
int digest_len = 16;
char *digest = NULL;
unsigned char *raw_digest = NULL;
- crm_data_t *sorted = sorted_xml(input);
- char *buffer = dump_xml_formatted(sorted);
+ crm_data_t *sorted = NULL;
+ char *buffer = NULL;
+
+ if(sort) {
+ sorted = sorted_xml(input);
+ } else {
+ sorted = copy_xml(input);
+ }
+ buffer = dump_xml_formatted(sorted);
CRM_CHECK(buffer != NULL && strlen(buffer) > 0,
free_xml(sorted); return NULL);
------------------------------
Message: 2
Date: Fri, 31 Mar 2006 08:33:16 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
native.c
Log Message:
Dont display provider for lsb and heartbeat resources
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- native.c 31 Mar 2006 12:05:37 -0000 1.122
+++ native.c 31 Mar 2006 15:33:16 -0000 1.123
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.122 2006/03/31 12:05:37 andrew Exp $ */
+/* $Id: native.c,v 1.123 2006/03/31 15:33:16 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -962,8 +962,13 @@
resource_t *rsc, const char *pre_text, long options, void *print_data)
{
node_t *node = NULL;
- const char *prov = crm_element_value(rsc->xml,XML_AGENT_ATTR_PROVIDER);
+ const char *prov = NULL;
+ const char *class = crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS);
+ if(safe_str_eq(class, "ocf")) {
+ prov = crm_element_value(rsc->xml, XML_AGENT_ATTR_PROVIDER);
+ }
+
if(rsc->running_on != NULL) {
node = rsc->running_on->data;
}
@@ -990,19 +995,17 @@
if((options & pe_print_rsconly) || g_list_length(rsc->running_on) > 1) {
const char *desc = NULL;
desc = crm_element_value(rsc->xml, XML_ATTR_DESC);
- status_print("%s%s (%s%s%s:%s)%s%s",
+ status_print("%s%s\t(%s%s%s:%s)%s%s",
pre_text?pre_text:"", rsc->id,
prov?prov:"", prov?"::":"",
- crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS),
- crm_element_value(rsc->xml, XML_ATTR_TYPE),
+ class, crm_element_value(rsc->xml, XML_ATTR_TYPE),
desc?": ":"", desc?desc:"");
} else {
- status_print("%s%s (%s%s%s:%s):\t%s %s%s",
+ status_print("%s%s\t(%s%s%s:%s):\t%s %s%s",
pre_text?pre_text:"", rsc->id,
prov?prov:"", prov?"::":"",
- crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS),
- crm_element_value(rsc->xml, XML_ATTR_TYPE),
+ class, crm_element_value(rsc->xml, XML_ATTR_TYPE),
(rsc->variant!=pe_native)?"":role2text(rsc->role),
(rsc->variant!=pe_native)?"":node!=NULL?node->details->uname:"",
rsc->is_managed?"":" (unmanaged) ");
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 92
********************************************
