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: lib by andrew from
([email protected])
3. Linux-HA CVS: tools by andrew from
([email protected])
4. Linux-HA CVS: crm by lars from ([email protected])
5. Linux-HA CVS: crm by lars from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 30 May 2006 06:24:37 -0600 (MDT)
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:
Addition to zhenh's commit from Tue, 30 May 2006 00:37:17 -0600 (MDT):
If it's going to be specified on the commandline anyway, this logic is
superfluous (as it never was invoked because of libdir never being
empty, anyway).
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -3 -r1.525 -r1.526
--- configure.in 30 May 2006 06:37:17 -0000 1.525
+++ configure.in 30 May 2006 12:24:36 -0000 1.526
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.525 $) dnl cvs revision
+AC_REVISION($Revision: 1.526 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -68,22 +68,6 @@
;;
esac
-needs_64_bit_libs() {
- case `uname -m` in
- x86_64)
- # Hmmm... Let's check for building from chrooted 32-bit environment...
- case `file /bin/uname` in
- *64-bit*|*x86-64*) true;;
- *80?86*) false;;
- *) true;;
- esac
- ;;
- # FIXME. I don't think this is completely general enough.
- s390*) true;;
- *) false;;
- esac
-}
-
AC_SUBST(INIT_EXT)
AC_SUBST(USE_MODULES)
@@ -208,28 +192,8 @@
infodir=`var "$infodir" "$prefix/info"`
mandir=`var "$mandir" "$exec_prefix/man"`
docdir=${datadir}/doc/${HB_PKG}-${VERSION}
-
-if test x"$libdir" = x; then
- libdir="$exec_prefix/lib"
- if needs_64_bit_libs; then
- old=$libdir
- libdir=$exec_prefix/lib64
- AC_MSG_WARN(overriding libdir from $old to $libdir)
- fi
-else
- libdir=`eval echo "$libdir"`
-fi
-
-if test x"$libexecdir" = x; then
- libexecdir="$exec_prefix/libexec"
- if needs_64_bit_libs; then
- old=$libexecdir
- libexecdir=$exec_prefix/lib64
- AC_MSG_WARN(overriding libexecdir from $old to $libexecdir)
- fi
-else
- libexecdir=`eval echo "$libexecdir"`
-fi
+libdir=`var "$libdir" "$exec_prefix/lib"`
+libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
dnl The GNU conventions for installation directories don't always
dnl sit well with this software. In particular, GNU's stated:
------------------------------
Message: 2
Date: Tue, 30 May 2006 06:26:34 -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:
Remove an eroneous \n
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- xml.c 30 May 2006 12:15:48 -0000 1.87
+++ xml.c 30 May 2006 12:26:33 -0000 1.88
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.87 2006/05/30 12:15:48 andrew Exp $ */
+/* $Id: xml.c,v 1.88 2006/05/30 12:26:33 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -2502,7 +2502,7 @@
cvp->warning = (xmlValidityWarningFunc) cl_log;
if (!xmlValidateDtd(cvp, doc, dtd)) {
- crm_err("CIB does not validate against %s\n", dtd_file);
+ crm_err("CIB does not validate against %s", dtd_file);
valid = FALSE;
crm_log_xml_debug(xml_blob, "invalid");
}
------------------------------
Message: 3
Date: Tue, 30 May 2006 08:06:07 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: tools by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : tools
Dir : linux-ha/tools
Modified Files:
pingd.c
Log Message:
Accept the other possible status for ping nodes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/pingd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- pingd.c 16 May 2006 14:46:25 -0000 1.4
+++ pingd.c 30 May 2006 14:06:06 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Id: pingd.c,v 1.4 2006/05/16 14:46:25 andrew Exp $ */
+/* $Id: pingd.c,v 1.5 2006/05/30 14:06:06 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -354,6 +354,8 @@
if(safe_str_eq(value, PINGSTATUS)) {
(*num_active)++;
+ } else if(safe_str_eq(value, LINKUP)) {
+ (*num_active)++;
}
}
------------------------------
Message: 4
Date: Tue, 30 May 2006 09:12:23 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm
Modified Files:
crm-1.0.dtd
Log Message:
Temporary work-around for #1278: Allow rsc_location w/o rules into the
CIB, as the GUI creates them.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- crm-1.0.dtd 29 May 2006 15:59:34 -0000 1.71
+++ crm-1.0.dtd 30 May 2006 15:12:23 -0000 1.72
@@ -159,7 +159,7 @@
score (INFINITY|-INFINITY) #REQUIRED>
<!-- Annotated version -->
-<!ELEMENT rsc_location (lifetime?,rule+)>
+<!ELEMENT rsc_location (lifetime?,rule*)>
<!ATTLIST rsc_location
id CDATA #REQUIRED
description CDATA #IMPLIED
------------------------------
Message: 5
Date: Tue, 30 May 2006 09:48:17 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm
Modified Files:
crm-1.0.dtd
Log Message:
Further relax DTD validation in an effort to work-around #1278.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crm-1.0.dtd,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- crm-1.0.dtd 30 May 2006 15:12:23 -0000 1.72
+++ crm-1.0.dtd 30 May 2006 15:48:17 -0000 1.73
@@ -168,7 +168,7 @@
<!ATTLIST lifetime id CDATA #REQUIRED>
<!-- Annotated version -->
-<!ELEMENT rule (expression|date_expression|rule)+>
+<!ELEMENT rule (expression|date_expression|rule)*>
<!ATTLIST rule
id CDATA #REQUIRED
role CDATA #IMPLIED
------------------------------
_______________________________________________
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 105
*********************************************
