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: lib by sunjd from ([email protected])
2. Linux-HA CVS: debian by horms from
([email protected])
3. Linux-HA CVS: debian by horms from
([email protected])
4. Linux-HA CVS: heartbeat by horms from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 12 Jun 2006 02:18:17 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/lrm
Modified Files:
raexecstonith.c
Log Message:
log tweak; temporarily work around bug 1300
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/lrm/raexecstonith.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- raexecstonith.c 30 May 2006 10:14:46 -0000 1.21
+++ raexecstonith.c 12 Jun 2006 08:18:16 -0000 1.22
@@ -188,7 +188,8 @@
g_snprintf(buffer_tmp, sizeof(buffer_tmp), "%s_%d"
, "STONITH_RA_EXEC", getpid());
if (ST_OK != stonithd_signon(buffer_tmp)) {
- cl_log(LOG_ERR, "STONITH_RA_EXEC: Cannot sign on the
stonithd.");
+ cl_log(LOG_ERR, "%s:%d: Cannot sign on the stonithd."
+ , __FUNCTION__, __LINE__);
exit(EXECRA_UNKNOWN_ERROR);
}
@@ -280,8 +281,10 @@
*rsc_info = NULL;
}
+ cl_log(LOG_INFO, "To get stonith resource list");
if (ST_OK != stonithd_signon("STONITH_RA")) {
- cl_log(LOG_ERR, "Can not signon to the stonithd.");
+ cl_log(LOG_ERR, "%s:%d: Can not signon to the stonithd."
+ , __FUNCTION__, __LINE__);
return -1;
}
------------------------------
Message: 2
Date: Mon, 12 Jun 2006 02:26:53 -0600 (MDT)
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:
changelog heartbeat-2.files rules
Log Message:
Debian Packaging Update
heartbeat-2 (2.0.5-5) unstable; urgency=low
* Reverse the change made in 2.0.5-4
It turns out that in heartbeat-2 (as opposed to heartbeat)
is a script which calls a binary that is located in
/usr/lib/ocf/resource.d/heartbeat/
-- Simon Horman <[EMAIL PROTECTED]> Mon, 12 Jun 2006 17:19:52 +0900
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- changelog 12 Jun 2006 07:46:52 -0000 1.66
+++ changelog 12 Jun 2006 08:26:52 -0000 1.67
@@ -1,3 +1,12 @@
+heartbeat-2 (2.0.5-5) unstable; urgency=low
+
+ * Reverse the change made in 2.0.5-4
+ It turns out that in heartbeat-2 (as opposed to heartbeat)
+ is a script which calls a binary that is located in
+ /usr/lib/ocf/resource.d/heartbeat/
+
+ -- Simon Horman <[EMAIL PROTECTED]> Mon, 12 Jun 2006 17:19:52 +0900
+
heartbeat-2 (2.0.5-4) unstable; urgency=low
* Move IPv6addr from /etc/ha.d/resource.d/ into /usr/lib/heartbeat,
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.files,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- heartbeat-2.files 12 Jun 2006 07:46:52 -0000 1.22
+++ heartbeat-2.files 12 Jun 2006 08:26:52 -0000 1.23
@@ -92,7 +92,6 @@
usr/lib/heartbeat/ipctransientclient
usr/lib/heartbeat/ipctransientserver
usr/lib/heartbeat/ipfail
-usr/lib/heartbeat/IPv6addr
usr/lib/heartbeat/login.png
usr/lib/heartbeat/logout.png
usr/lib/heartbeat/logtest
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/rules,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- rules 12 Jun 2006 07:46:52 -0000 1.38
+++ rules 12 Jun 2006 08:26:52 -0000 1.39
@@ -102,11 +102,6 @@
cd $(DTMP)/etc/ha.d/resource.d \
&& ln -s /usr/sbin/ldirectord ldirectord
cd $(DTMP)/etc/ && ln -s ha.d heartbeat
-
- # Binaries are not allowed in /etc
- mv $(DTMP)/etc/ha.d/resource.d/IPv6addr $(DTMP)/usr/lib/heartbeat
- cd $(DTMP)/etc/ha.d/resource.d/ && ln -s /usr/lib/heartbeat/IPv6addr .
-
dh_movefiles --source=debian/tmp
binary-indep: build install
------------------------------
Message: 3
Date: Mon, 12 Jun 2006 03:01:39 -0600 (MDT)
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
rules
Log Message:
Avoid putting the IPv6addr in etc. Rather put it in lib and then symlink it
back to etc. This is not needed in the head (2.0) branch as that in that tree
this file is a script which calls the ocf IPv6addr binary which already lives
in lib
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/rules,v
retrieving revision 1.15.2.18
retrieving revision 1.15.2.19
diff -u -3 -r1.15.2.18 -r1.15.2.19
--- rules 12 Jun 2006 07:47:18 -0000 1.15.2.18
+++ rules 12 Jun 2006 09:01:39 -0000 1.15.2.19
@@ -99,10 +99,6 @@
&& ln -s /usr/sbin/ldirectord ldirectord
cd $(DTMP)/etc/ && ln -s ha.d heartbeat
- # Binaries are not allowed in /etc
- mv $(DTMP)/etc/ha.d/resource.d/IPv6addr $(DTMP)/usr/lib/heartbeat
- cd $(DTMP)/etc/ha.d/resource.d/ && ln -s /usr/lib/heartbeat/IPv6addr .
-
dh_movefiles --source=debian/tmp
binary-indep: build install
------------------------------
Message: 4
Date: Mon, 12 Jun 2006 03:01:39 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat/resource.d
Modified Files:
Tag: STABLE_1_2
Makefile.am
Log Message:
Avoid putting the IPv6addr in etc. Rather put it in lib and then symlink it
back to etc. This is not needed in the head (2.0) branch as that in that tree
this file is a script which calls the ocf IPv6addr binary which already lives
in lib
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/resource.d/Attic/Makefile.am,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -u -3 -r1.19.2.4 -r1.19.2.5
--- Makefile.am 23 Mar 2005 09:23:37 -0000 1.19.2.4
+++ Makefile.am 12 Jun 2006 09:01:39 -0000 1.19.2.5
@@ -30,11 +30,13 @@
harddir = $(sysconfdir)/ha.d/resource.d
+halibdir = $(libdir)/@HB_PKG@
+
if USE_IPV6ADDR
-hard_PROGRAMS = IPv6addr
+halib_PROGRAMS = IPv6addr
else
-hard_PROGRAMS =
+halib_PROGRAMS =
endif
IPv6addr_SOURCES = IPv6addr.c
@@ -65,3 +67,15 @@
WAS \
WinPopup \
Xinetd
+
+if USE_IPV6ADDR
+install-exec-local:
+ mkdir -p $(DESTDIR)$(harddir)
+ test ! -e $(DESTDIR)$(harddir)/IPv6addr || \
+ rm $(DESTDIR)$(harddir)/IPv6addr
+ cd $(DESTDIR)$(harddir) && ln -s $(halibdir)/IPv6addr .
+
+uninstall-local:
+ test ! -e $(DESTDIR)$(harddir)/IPv6addr || \
+ rm $(DESTDIR)$(harddir)/IPv6addr
+endif
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 37
********************************************
