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: doc by alan from ([email protected])
2. Linux-HA CVS: mgmt by msoffen from
([email protected])
3. Linux-HA CVS: replace by msoffen from
([email protected])
4. Linux-HA CVS: heartbeat by msoffen from
([email protected])
5. Linux-HA CVS: lib by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 1 May 2006 15:09:55 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: doc by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : doc
Dir : linux-ha/doc
Modified Files:
cibadmin.8.in
Log Message:
Minor improvements in the man page.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/doc/cibadmin.8.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- cibadmin.8.in 1 May 2006 17:10:50 -0000 1.3
+++ cibadmin.8.in 1 May 2006 21:09:55 -0000 1.4
@@ -1,4 +1,4 @@
-.TH CIBADMIN 8 "$Date: 2006/05/01 17:10:50 $" "Linux-HA/OpenHA Project"
"Heartbeat @VERSION@ Adminstration Guide"
+.TH CIBADMIN 8 "$Date: 2006/05/01 21:09:55 $" "Linux-HA/OpenHA Project"
"Heartbeat @VERSION@ Adminstration Guide"
.SH NAME
\fIcibadmin\fP \- read, modify, or administer heartbeat Cluster Information
Base
.SH SYNOPSIS
@@ -137,9 +137,8 @@
\f(CWcibadmin \-Q \-\-obj_type status\fP
.RE
.PP
-To add an IPaddr2 resource to the \fIresources\fP section, follow these steps:
-.IP 1.
-Create a file \fIfoo\fP with the following contents:
+To add an IPaddr2 resource to the \fIresources\fP section, first
+create a file \fIfoo\fP with the following contents:
.RS
.nf
\f(CW<primitive id="R_10.10.10.101" class="ocf" type="IPaddr2"
@@ -153,8 +152,7 @@
</primitive>\fP
.fi
.RE
-.IP 2.
-Issue the following command:
+Then, issue the following command:
.RS
\f(CWcibadmin \-\-obj_type resources \-U \-x foo\fP
.RE
@@ -207,6 +205,7 @@
.SH FILES
\f([EMAIL PROTECTED]@/crm/cib.xml\fP \- the CIB (minus status section) on disk.
.SH SEE ALSO
+crm_resource(8),
crmadmin(8),
lrmadmin(8),
heartbeat(8)
------------------------------
Message: 2
Date: Mon, 1 May 2006 16:54:49 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmtd.c
Log Message:
Added socket and socketio.h files.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmtd.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- mgmtd.c 10 Apr 2006 01:38:10 -0000 1.19
+++ mgmtd.c 1 May 2006 22:54:49 -0000 1.20
@@ -22,6 +22,12 @@
#include <portability.h>
#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
#include <pwd.h>
#include <grp.h>
#include <unistd.h>
------------------------------
Message: 3
Date: Mon, 1 May 2006 16:55:18 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: replace by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Project : linux-ha
Module : replace
Dir : linux-ha/replace
Modified Files:
Makefile.am
Log Message:
Added libtool and quiet_libtool_opts
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/replace/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 29 Jul 2005 06:59:36 -0000 1.4
+++ Makefile.am 1 May 2006 22:55:18 -0000 1.5
@@ -20,6 +20,10 @@
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/linux-ha -I$(top_builddir)/linux-ha
+QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@
+LIBTOOL = @LIBTOOL@ @QUIET_LIBTOOL_OPTS@
+
+
noinst_LTLIBRARIES = libreplace.la
libreplace_la_SOURCES =
libreplace_la_LIBADD = @LTLIBOBJS@
------------------------------
Message: 4
Date: Mon, 1 May 2006 16:57:22 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/libnet_util
Modified Files:
send_arp.c
Log Message:
Fixed to compile with older libnet.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/libnet_util/send_arp.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- send_arp.c 19 Dec 2005 16:57:34 -0000 1.24
+++ send_arp.c 1 May 2006 22:57:21 -0000 1.25
@@ -1,4 +1,4 @@
-/* $Id: send_arp.c,v 1.24 2005/12/19 16:57:34 andrew Exp $ */
+/* $Id: send_arp.c,v 1.25 2006/05/01 22:57:21 msoffen Exp $ */
/*
* send_arp
*
@@ -298,20 +298,15 @@
struct libnet_link_int *network;
char err_buf[LIBNET_ERRBUF_SIZE];
- /* Get around bad prototype for libnet_error() */
- char errmess1 [] = "libnet_open_link_interface: %s\n";
- char errmess2 [] = "libnet_get_hwaddr: %s\n";
-
-
network = libnet_open_link_interface(device, err_buf);
if (!network) {
- libnet_error(LIBNET_ERR_FATAL, errmess1, err_buf);
+ fprintf(stderr, "libnet_open_link_interface: %s\n", err_buf);
return -1;
}
mac_address = libnet_get_hwaddr(network, device, err_buf);
if (!mac_address) {
- libnet_error(LIBNET_ERR_FATAL, errmess2, err_buf);
+ fprintf(stderr, "libnet_get_hwaddr: %s\n", err_buf);
return -1;
}
@@ -701,6 +696,9 @@
/*
* $Log: send_arp.c,v $
+ * Revision 1.25 2006/05/01 22:57:21 msoffen
+ * Fixed to compile with older libnet.
+ *
* Revision 1.24 2005/12/19 16:57:34 andrew
* Make use of the errbuf when there was an error.
*
------------------------------
Message: 5
Date: Tue, 2 May 2006 03:59:16 -0600 (MDT)
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:
update_xml_child() will now update the complete object
including adding new child objects if required
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- xml.c 9 Apr 2006 15:11:00 -0000 1.73
+++ xml.c 2 May 2006 09:59:15 -0000 1.74
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.73 2006/04/09 15:11:00 andrew Exp $ */
+/* $Id: xml.c,v 1.74 2006/05/02 09:59:15 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -266,7 +266,7 @@
local_prop_value = new_value;
}
}
-
+
crm_xml_add(target, local_prop_name, local_prop_value);
crm_free(incr_value);
crm_free(new_value);
@@ -1905,9 +1905,6 @@
{
const char *object_id = NULL;
const char *object_name = NULL;
- const char *right_val = NULL;
-
- int result = 0;
crm_log_xml(LOG_DEBUG_5, "update:", update);
crm_log_xml(LOG_DEBUG_5, "target:", target);
@@ -1929,62 +1926,28 @@
if(target == NULL) {
target = create_xml_node(parent, object_name);
- crm_debug_2("Added <%s%s%s/>",
- crm_str(object_name),
- object_id?" id=":"", object_id?object_id:"");
CRM_CHECK(target != NULL, return 0);
+ crm_debug_2("Added <%s%s%s/>", crm_str(object_name),
+ object_id?" id=":"", object_id?object_id:"");
} else {
- crm_debug_2("Found node <%s%s%s/> to update",
+ crm_debug_3("Found node <%s%s%s/> to update",
crm_str(object_name),
object_id?" id=":"", object_id?object_id:"");
}
-
- xml_prop_iter(update, prop_name, left_value,
- right_val = crm_element_value(target, prop_name);
- if(safe_str_eq(prop_name, XML_DIFF_MARKER)) {
- continue;
- } else if(right_val == NULL) {
- crm_xml_add(target, prop_name, left_value);
- crm_debug_2("\t%s: %s (added)",
- crm_str(prop_name),
- crm_str(left_value));
-
- } else if(safe_str_neq(left_value, right_val)) {
- crm_xml_add(target, prop_name, left_value);
- crm_debug_2("\t%s: %s->%s",
- crm_str(prop_name),
- crm_str(left_value),
- right_val);
- }
- );
+ copy_in_properties(target, update);
- crm_debug_3("Processing children of <%s id=%s>",
- crm_str(object_name), crm_str(object_id));
-
xml_child_iter(
update, a_child,
- int tmp_result = 0;
- crm_debug_3("Updating child <%s id=%s>",
+ crm_debug_4("Updating child <%s id=%s>",
crm_element_name(a_child), ID(a_child));
-
- tmp_result = add_xml_object(target, NULL, a_child);
-
- if(tmp_result < 0) {
- crm_err("Error updating child <%s id=%s>",
- crm_element_name(a_child), ID(a_child));
-
- /* only the first error is likely to be interesting */
- if(result >= 0) {
- result = tmp_result;
- }
- }
+ add_xml_object(target, NULL, a_child);
);
crm_debug_3("Finished with <%s id=%s>",
crm_str(object_name), crm_str(object_id));
- return result;
+ return 0;
}
gboolean
@@ -2003,7 +1966,7 @@
} else if(can_update) {
crm_log_xml_debug(child, "Update match found...");
- copy_in_properties(child, to_update);
+ add_xml_object(NULL, child, to_update);
}
xml_child_iter(
------------------------------
_______________________________________________
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 3
*******************************************
