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: debian by horms from
([email protected])
2. Linux-HA CVS: lrm by sunjd from ([email protected])
3. Linux-HA CVS: lrm by sunjd from ([email protected])
4. Linux-HA CVS: lrm by alan from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 26 Dec 2005 21:55:22 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
Tag: STABLE_1_2
changelog control
Log Message:
Debian Packaging Upldates: Uploaded to Debian as heartbeat 1.2.4-2
heartbeat (1.2.4-2) unstable; urgency=low
* Rebuild, as i386 upload was missing depenancies on vanessa libraries.
This was caused by a ~/.magic in the build environment that had very
unexpected side affects. Primarily causing file to return "data"
instead of "ELF" on ELF executables, and thus causing all executables
to be skipped by dh_shlibdeps.
* Add dependancy on openssh-client which is needed as
00-ssh_scp_path.patch was removed in 1.2.4-1
* Slightly Enhanced package descriptions
(closes: #337895, #337896)
-- Simon Horman <[EMAIL PROTECTED]> Tue, 27 Dec 2005 13:38:55 +0900
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.17.2.31
retrieving revision 1.17.2.32
diff -u -3 -r1.17.2.31 -r1.17.2.32
--- changelog 7 Nov 2005 04:27:02 -0000 1.17.2.31
+++ changelog 27 Dec 2005 04:55:22 -0000 1.17.2.32
@@ -1,12 +1,27 @@
+heartbeat (1.2.4-2) unstable; urgency=low
+
+ * Rebuild, as i386 upload was missing depenancies on vanessa libraries.
+ This was caused by a ~/.magic in the build environment that had very
+ unexpected side affects. Primarily causing file to return "data"
+ instead of "ELF" on ELF executables, and thus causing all executables
+ to be skipped by dh_shlibdeps.
+ * Add dependancy on openssh-client which is needed as 00-ssh_scp_path.patch
+ was removed in 1.2.4-1
+ * Slightly Enhanced package descriptions
+ (closes: #337895, #337896)
+
+ -- Simon Horman <[EMAIL PROTECTED]> Tue, 27 Dec 2005 13:38:55 +0900
+
heartbeat (1.2.4-1) unstable; urgency=low
* New Upstream
* Make sure adduser is passed the --system flag
(closes: #336180)
- * Slightly Enhanced package descriptions
- (closes: #337895, #337896)
+ * Don't apply 00-ssh_scp_path.patch as it shouldn't be
+ needed and it creates a lot of diff due to automake and
+ autoconf regenerating everything.
- -- Simon Horman <[EMAIL PROTECTED]> Mon, 7 Nov 2005 13:21:33 +0900
+ -- Simon Horman <[EMAIL PROTECTED]> Fri, 9 Dec 2005 10:10:15 +0900
heartbeat (1.2.3.cvs.20050927-3) unstable; urgency=low
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/control,v
retrieving revision 1.17.2.23
retrieving revision 1.17.2.24
diff -u -3 -r1.17.2.23 -r1.17.2.24
--- control 7 Nov 2005 04:27:02 -0000 1.17.2.23
+++ control 27 Dec 2005 04:55:22 -0000 1.17.2.24
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Simon Horman <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libsnmp9-dev, libglib1.2-dev, perl,
net-tools, netkit-ping | iputils-ping, python, psmisc, modutils, libnet1-dev,
iproute, libssl-dev, libtool, automake, libcurl3-dev, libxml2-dev, bison, flex,
libsensors-dev, uuid-dev
+Build-Depends: debhelper (>= 4.0.0), libsnmp9-dev, libglib1.2-dev, perl,
net-tools, netkit-ping | iputils-ping, python, psmisc, modutils, libnet1-dev,
iproute, libssl-dev, libtool, automake, libcurl3-dev, libxml2-dev, bison, flex,
libsensors-dev, uuid-dev, openssh-client
Standards-Version: 3.6.2
Package: ldirectord
------------------------------
Message: 2
Date: Tue, 27 Dec 2005 03:21:46 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
should be GT
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -3 -r1.194 -r1.195
--- lrmd.c 26 Dec 2005 22:58:29 -0000 1.194
+++ lrmd.c 27 Dec 2005 10:21:45 -0000 1.195
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.194 2005/12/26 22:58:29 alan Exp $ */
+/* $Id: lrmd.c,v 1.195 2005/12/27 10:21:45 sunjd Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -79,7 +79,7 @@
cl_log(priority, fmt); \
#define lrmd_debug(priority, fmt...); \
- if ( debug_level == 1 ) { \
+ if ( debug_level >= 1 ) { \
cl_log(priority, fmt); \
}
@@ -3452,6 +3452,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.195 2005/12/27 10:21:45 sunjd
+ * should be GT
+ *
* Revision 1.194 2005/12/26 22:58:29 alan
* Made minor reformatting changes and removed extra blanks at end of lines.
*
------------------------------
Message: 3
Date: Tue, 27 Dec 2005 04:06:03 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
Force to read the stdout of the excution of a RA
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -3 -r1.195 -r1.196
--- lrmd.c 27 Dec 2005 10:21:45 -0000 1.195
+++ lrmd.c 27 Dec 2005 11:06:02 -0000 1.196
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.195 2005/12/27 10:21:45 sunjd Exp $ */
+/* $Id: lrmd.c,v 1.196 2005/12/27 11:06:02 sunjd Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -3108,6 +3108,7 @@
}
op_type = ha_msg_value(op->msg, F_LRM_OP);
+ handle_pipe_ra_stdout(-1, op);
rc = RAExec->map_ra_retvalue(exitcode, op_type,
op->first_line_ra_stdout);
if (rc != EXECRA_OK || debug_level > 0) {
if (signo != 0) {
@@ -3248,6 +3249,14 @@
const char* op_type = NULL;
char * data = NULL;
+ if (op == NULL) {
+ lrmd_log(LOG_DEBUG, "%s:%d: op==NULL.", __FUNCTION__, __LINE__);
+ }
+
+ if (fd == -1) {
+ fd = op->ra_stdout_fd;
+ }
+
if (0 != read_pipe(fd, &data, op)) {
rc = FALSE;
}
@@ -3452,6 +3461,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.196 2005/12/27 11:06:02 sunjd
+ * Force to read the stdout of the excution of a RA
+ *
* Revision 1.195 2005/12/27 10:21:45 sunjd
* should be GT
*
------------------------------
Message: 4
Date: Tue, 27 Dec 2005 09:12:12 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
Put in a minor fix to only reread (overwrite) the output from stdout if
we haven't already captured it.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -3 -r1.196 -r1.197
--- lrmd.c 27 Dec 2005 11:06:02 -0000 1.196
+++ lrmd.c 27 Dec 2005 16:12:11 -0000 1.197
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.196 2005/12/27 11:06:02 sunjd Exp $ */
+/* $Id: lrmd.c,v 1.197 2005/12/27 16:12:11 alan Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -3108,7 +3108,9 @@
}
op_type = ha_msg_value(op->msg, F_LRM_OP);
- handle_pipe_ra_stdout(-1, op);
+ if (op->first_line_ra_stdout[0] == EOS) {
+ handle_pipe_ra_stdout(-1, op);
+ }
rc = RAExec->map_ra_retvalue(exitcode, op_type,
op->first_line_ra_stdout);
if (rc != EXECRA_OK || debug_level > 0) {
if (signo != 0) {
@@ -3461,6 +3463,10 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.197 2005/12/27 16:12:11 alan
+ * Put in a minor fix to only reread (overwrite) the output from stdout if
+ * we haven't already captured it.
+ *
* Revision 1.196 2005/12/27 11:06:02 sunjd
* Force to read the stdout of the excution of a RA
*
------------------------------
_______________________________________________
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 71
********************************************
