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: linux-ha by lars from
([email protected])
2. Linux-HA CVS: fencing by sunjd from
([email protected])
3. Linux-HA CVS: cim by lars from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 12 Dec 2005 14:57:41 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
If the path to the CMPI headers isn't part of the include search path,
the other headers may not be includeable. Simplified Makefile.am
(because it's now always -Included).
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -3 -r1.478 -r1.479
--- configure.in 12 Dec 2005 21:33:41 -0000 1.478
+++ configure.in 12 Dec 2005 21:57:41 -0000 1.479
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.478 $) dnl cvs revision
+AC_REVISION($Revision: 1.479 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -1096,15 +1096,11 @@
fi
if test "x${enable_cim_provider}" = "xyes"; then
- if test "x${CMPI_HEADER_PATH}" = "x"; then
- CMPIHEADERS="cmpidt.h cmpift.h cmpimacs.h"
- else
- CMPIHEADERS="${CMPI_HEADER_PATH}/cmpidt.h
- ${CMPI_HEADER_PATH}/cmpift.h
- ${CMPI_HEADER_PATH}/cmpimacs.h"
+ if test "x${CMPI_HEADER_PATH}" != "x"; then
+ CPPFLAGS="$CPPFLAGS -I${CMPI_HEADER_PATH}"
fi
- for header in ${CMPIHEADERS}
+ for header in cmpidt.h cmpift.h cmpimacs.h
do
AC_CHECK_HEADER([${header}], [],
[AC_MSG_ERROR([Sorry, can't find CMPI header
files, \
------------------------------
Message: 2
Date: Tue, 13 Dec 2005 00:56:30 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: fencing by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : fencing
Dir : linux-ha/fencing/stonithd
Modified Files:
stonithd.c
Log Message:
bug918:redirect stonith library messages
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/fencing/stonithd/stonithd.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- stonithd.c 6 Dec 2005 06:35:53 -0000 1.80
+++ stonithd.c 13 Dec 2005 07:56:29 -0000 1.81
@@ -1,4 +1,4 @@
-/* $Id: stonithd.c,v 1.80 2005/12/06 06:35:53 sunjd Exp $ */
+/* $Id: stonithd.c,v 1.81 2005/12/13 07:56:29 sunjd Exp $ */
/* File: stonithd.c
* Description: STONITH daemon for node fencing
@@ -84,6 +84,10 @@
cl_log(priority, fmt); \
}
+static int pil_loglevel_to_cl_loglevel[] = {
+ 0, 1, 2, 4, 6, 7
+ };
+
typedef struct {
char * name;
pid_t pid; /* client pid */
@@ -256,6 +260,7 @@
static int require_local_stonithop(stonith_ops_t * st_op, stonith_rsc_t *
srsc,
const char * asker_node);
static int broadcast_reset_success(const char * target);
+static void trans_log(int priority, const char * fmt, ...)G_GNUC_PRINTF(2,3);
static struct api_msg_to_handler api_msg_to_handlers[] = {
{ ST_SIGNON, on_stonithd_signon },
@@ -2705,6 +2710,8 @@
/* Set the stonith plugin's debug level */
stonith_set_debug(stonith_obj, debug_level);
+ stonith_set_log(stonith_obj, trans_log);
+
snv = stonith_ghash_to_NVpair(op->params);
if ( snv == NULL
|| stonith_set_config(stonith_obj, snv) != S_OK ) {
@@ -3241,8 +3248,25 @@
return TRUE;
}
+static void
+trans_log(int priority, const char * fmt, ...)
+{
+ va_list ap;
+ char buf[MAXLINE];
+
+ va_start(ap, fmt);
+ vsnprintf(buf, sizeof(buf)-1, fmt, ap);
+ va_end(ap);
+ cl_log(pil_loglevel_to_cl_loglevel[ priority % sizeof
+ (pil_loglevel_to_cl_loglevel) ], "%s", buf);
+}
+
+
/*
* $Log: stonithd.c,v $
+ * Revision 1.81 2005/12/13 07:56:29 sunjd
+ * bug918:redirect stonith library messages
+ *
* Revision 1.80 2005/12/06 06:35:53 sunjd
* BEAM fix
*
------------------------------
Message: 3
Date: Tue, 13 Dec 2005 06:43:53 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim
Modified Files:
Makefile.am
Log Message:
Libraries need to be added using LDADD, not LDFLAGS, else dependencies
will not be detected.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am 12 Dec 2005 21:57:41 -0000 1.10
+++ Makefile.am 13 Dec 2005 13:43:53 -0000 1.11
@@ -68,71 +68,71 @@
#--------------------------------------------------------------
liblinuxha_info_la_SOURCES = linuxha_info.c
-liblinuxha_info_la_LDFLAGS = $(COMMONLIBS)
+liblinuxha_info_la_LIBADD = $(COMMONLIBS)
#--------------------------------------------------------------
libcmpiLinuxHA_ClusterProvider_la_SOURCES = cmpi_utils.c cmpi_cluster.c
cmpi_cluster_provider.c
-libcmpiLinuxHA_ClusterProvider_la_LDFLAGS = $(COMMONLIBS) liblinuxha_info.la
+libcmpiLinuxHA_ClusterProvider_la_LIBADD = $(COMMONLIBS) liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_SoftwareIdentityProvider_la_SOURCES = cmpi_utils.c
cmpi_software_identity_provider.c
-libcmpiLinuxHA_SoftwareIdentityProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
+libcmpiLinuxHA_SoftwareIdentityProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_ClusterResourceProvider_la_SOURCES = cmpi_utils.c
cmpi_resource.c ha_resource.c \
cmpi_resource_provider.c
-libcmpiLinuxHA_ClusterResourceProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
+libcmpiLinuxHA_ClusterResourceProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_ClusterNodeProvider_la_SOURCES = cmpi_utils.c cmpi_node.c
cmpi_node_provider.c
-libcmpiLinuxHA_ClusterNodeProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
+libcmpiLinuxHA_ClusterNodeProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_ParticipatingNodeProvider_la_SOURCES = cmpi_utils.c \
cmpi_participating_node_provider.c
-libcmpiLinuxHA_ParticipatingNodeProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
+libcmpiLinuxHA_ParticipatingNodeProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_HostedResourceProvider_la_SOURCES = cmpi_utils.c
\
cmpi_hosted_resource.c
\
cmpi_hosted_resource_provider.c
-libcmpiLinuxHA_HostedResourceProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
+libcmpiLinuxHA_HostedResourceProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_InstalledSoftwareIdentityProvider_la_SOURCES = cmpi_utils.c \
cmpi_installed_software_provider.c
-libcmpiLinuxHA_InstalledSoftwareIdentityProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
+libcmpiLinuxHA_InstalledSoftwareIdentityProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_ClusterResourceInstanceProvider_la_SOURCES = cmpi_utils.c \
cmpi_rsc_instance_provider.c
-libcmpiLinuxHA_ClusterResourceInstanceProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
+libcmpiLinuxHA_ClusterResourceInstanceProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_ClusterResourceInstanceAttrProvider_la_SOURCES = cmpi_utils.c \
cmpi_rsc_attribute_provider.c
-libcmpiLinuxHA_ClusterResourceInstanceAttrProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
+libcmpiLinuxHA_ClusterResourceInstanceAttrProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_ClusterResourceGroupProvider_la_SOURCES = cmpi_utils.c
ha_resource.c \
cmpi_rsc_group.c
\
cmpi_rsc_group_provider.c
-libcmpiLinuxHA_ClusterResourceGroupProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
+libcmpiLinuxHA_ClusterResourceGroupProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_SubResourceProvider_la_SOURCES = cmpi_utils.c
ha_resource.c \
cmpi_sub_resource.c
\
cmpi_sub_resource_provider.c
-libcmpiLinuxHA_SubResourceProvider_la_LDFLAGS = $(COMMONLIBS)
liblinuxha_info.la
+libcmpiLinuxHA_SubResourceProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
#--------------------------------------------------------------
libcmpiLinuxHA_IndicationProvider_la_SOURCES = cmpi_utils.c
cmpi_ha_indication.c \
cmpi_ha_indication_provider.c
-libcmpiLinuxHA_IndicationProvider_la_LDFLAGS = $(COMMONLIBS) liblinuxha_info.la
+libcmpiLinuxHA_IndicationProvider_la_LIBADD = $(COMMONLIBS) liblinuxha_info.la
#--------------------------------------------------------------
noinst_PROGRAMS = simpledemo
simpledemo_SOURCES = ha_resource.c cmpi_utils.c simple_demo.c
-simpledemo_LDFLAGS = $(COMMONLIBS) liblinuxha_info.la
+simpledemo_LDADD = $(COMMONLIBS) liblinuxha_info.la
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 30
********************************************
