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 davidlee from
([email protected])
2. Linux-HA CVS: tools by davidlee from
([email protected])
3. Linux-HA CVS: cts by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 19 Apr 2006 09:49:19 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Tidy a couple of config-time directory variables
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -3 -r1.505 -r1.506
--- configure.in 19 Apr 2006 12:22:08 -0000 1.505
+++ configure.in 19 Apr 2006 15:49:19 -0000 1.506
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.505 $) dnl cvs revision
+AC_REVISION($Revision: 1.506 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -236,7 +236,11 @@
AC_SUBST(HA_VARLIBDIR)
AC_DEFINE_UNQUOTED(HA_VARLIBDIR,"$HA_VARLIBDIR", var lib directory)
-HA_COREDIR="${HA_VARLIBDIR}/${HB_PKG}/cores"
+HA_VARLIBHBDIR="${HA_VARLIBDIR}/${HB_PKG}"
+AC_SUBST(HA_VARLIBHBDIR)
+AC_DEFINE_UNQUOTED(HA_VARLIBHBDIR,"$HA_VARLIBHBDIR", var lib heartbeat
directory)
+
+HA_COREDIR="${HA_VARLIBHBDIR}/cores"
AC_SUBST(HA_COREDIR)
AC_DEFINE_UNQUOTED(HA_COREDIR,"$HA_COREDIR", top directory of area to drop
core files in)
@@ -2172,7 +2176,11 @@
AC_SUBST(LOCALE)
-HB_RC_DIR=$sysconfdir/ha.d/rc.d
+HB_HA_DIR=$sysconfdir/ha.d
+AC_SUBST(HB_HA_DIR)
+AC_DEFINE_UNQUOTED(HB_HA_DIR,"$HB_HA_DIR", ha directory)
+
+HB_RC_DIR=$HB_HA_DIR/rc.d
AC_SUBST(HB_RC_DIR)
AC_DEFINE_UNQUOTED(HB_RC_DIR,"$HB_RC_DIR", rc directory)
------------------------------
Message: 2
Date: Wed, 19 Apr 2006 09:49:19 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: tools by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : tools
Dir : linux-ha/tools
Modified Files:
haresources2cib.py.in
Log Message:
Tidy a couple of config-time directory variables
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/haresources2cib.py.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- haresources2cib.py.in 12 Apr 2006 08:58:24 -0000 1.10
+++ haresources2cib.py.in 19 Apr 2006 15:49:19 -0000 1.11
@@ -336,9 +336,9 @@
return directive_list
if __name__=="__main__" :
- resource_file = "/etc/ha.d/haresources"
- config_file = "/etc/ha.d/ha.cf"
- target_file = "/var/lib/heartbeat/crm/cib.xml"
+ resource_file = "@HB_HA_DIR@/haresources"
+ config_file = "@HB_HA_DIR@/ha.cf"
+ target_file = "@HA_VARLIBHBDIR@/crm/cib.xml"
to_stdout = False
# Process arguments...
@@ -412,7 +412,7 @@
if to_stdout :
print cib[0].toprettyxml()
elif os.access(target_file, os.F_OK) or os.access(target_file+".sig",
os.F_OK) :
- sys.stderr.write("cib.xml or cib.xml.sig exist in
/var/lib/heartbeat/crm/\n")
+ sys.stderr.write("cib.xml or cib.xml.sig exist in
@HA_VARLIBHBDIR@/crm/\n")
sys.stderr.write("please remove them before generating new
cib.xml\n")
else :
cib_file = open(target_file, "w")
------------------------------
Message: 3
Date: Wed, 19 Apr 2006 10:16:56 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CTS.py.in
Log Message:
This slipped in
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTS.py.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- CTS.py.in 19 Apr 2006 14:51:09 -0000 1.57
+++ CTS.py.in 19 Apr 2006 16:16:56 -0000 1.58
@@ -505,7 +505,6 @@
if self.ShouldBeStatus[node] != self["down"]:
return 1
- print "Waiting for "+ node
if not self.ns.WaitForNodeToComeUp(node):
self.log("WaitForNodeToComeUp %s failed" % node)
return 0
------------------------------
Message: 4
Date: Wed, 19 Apr 2006 10:24:56 -0600 (MDT)
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/crmd
Modified Files:
callbacks.c
Log Message:
Not terribly interesting really
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- callbacks.c 18 Apr 2006 10:59:46 -0000 1.116
+++ callbacks.c 19 Apr 2006 16:24:55 -0000 1.117
@@ -220,7 +220,7 @@
msg = msgfromIPC_noauth(client);
if (msg == NULL) {
- crm_err("%s: no message this time",
+ crm_info("%s: no message this time",
curr_client->table_key);
continue;
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 103
*********************************************
