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: debian by horms from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 7 Mar 2006 20:27:31 -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:
changelog heartbeat-2-dev.files heartbeat-2.files
heartbeat-2.preinst
Log Message:
Debian Packaging Changes
* New Upstream
* Don't try and stop heartbeat in preinst on the first install
(closes: #355719)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- changelog 14 Feb 2006 10:06:18 -0000 1.60
+++ changelog 8 Mar 2006 03:27:30 -0000 1.61
@@ -1,3 +1,11 @@
+heartbeat-2 (2.0.4-1) unstable; urgency=low
+
+ * New Upstream
+ * Don't try and stop heartbeat in preinst on the first install
+ (closes: #355719)
+
+ -- Simon Horman <[EMAIL PROTECTED]> Wed, 8 Mar 2006 09:46:46 +0900
+
heartbeat-2 (2.0.3-2) unstable; urgency=low
* Add build dependancy on libncurses-dev to allow crm_mon to work
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2-dev.files,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- heartbeat-2-dev.files 11 Feb 2006 11:21:30 -0000 1.5
+++ heartbeat-2-dev.files 8 Mar 2006 03:27:30 -0000 1.6
@@ -58,6 +58,7 @@
usr/include/heartbeat/replace_uuid.h
usr/include/heartbeat/stonithd_api.h
usr/include/heartbeat/stonithd_msg.h
+usr/include/heartbeat/transition.h
usr/include/heartbeat/util.h
usr/include/heartbeat/xml.h
usr/include/ocf/oc_event.h
@@ -113,3 +114,4 @@
usr/lib/libstonith.so
usr/lib/libstonithd.la
usr/lib/libstonithd.so
+usr/lib/libtransitioner.so
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.files,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- heartbeat-2.files 11 Feb 2006 11:21:30 -0000 1.10
+++ heartbeat-2.files 8 Mar 2006 03:27:30 -0000 1.11
@@ -64,6 +64,7 @@
usr/lib/heartbeat/crmtest/helper.sh
usr/lib/heartbeat/crmtest/stop.sh
usr/lib/heartbeat/crmtest/testutils.pl
+usr/lib/heartbeat/cts/CIB.py
usr/lib/heartbeat/cts/CM_LinuxHAv2.py
usr/lib/heartbeat/cts/CM_fs.py
usr/lib/heartbeat/cts/CM_hb.py
@@ -137,11 +138,11 @@
usr/lib/libccmclient.so.1
usr/lib/libccmclient.so.1.0.0
usr/lib/libcib.so.1
-usr/lib/libcib.so.1.0.0
+usr/lib/libcib.so.1.0.1
usr/lib/libclm.so.1
usr/lib/libclm.so.1.0.0
usr/lib/libcrmcommon.so.1
-usr/lib/libcrmcommon.so.1.0.0
+usr/lib/libcrmcommon.so.1.0.1
usr/lib/libhbclient.so.1
usr/lib/libhbclient.so.1.0.0
usr/lib/libhbmgmt.so
@@ -159,7 +160,7 @@
usr/lib/liblrm.so.0
usr/lib/liblrm.so.0.0.0
usr/lib/libpengine.so.1
-usr/lib/libpengine.so.1.0.0
+usr/lib/libpengine.so.1.1.0
usr/lib/libpils.so.1
usr/lib/libpils.so.1.0.0
usr/lib/libplumb.so.1
@@ -172,6 +173,8 @@
usr/lib/libstonith.so.1.0.0
usr/lib/libstonithd.so.0
usr/lib/libstonithd.so.0.0.0
+usr/lib/libtransitioner.so.1
+usr/lib/libtransitioner.so.1.0.0
usr/lib/ocf/resource.d/heartbeat/AudibleAlarm
usr/lib/ocf/resource.d/heartbeat/ClusterMon
usr/lib/ocf/resource.d/heartbeat/Delay
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.preinst,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- heartbeat-2.preinst 14 Feb 2006 10:06:18 -0000 1.3
+++ heartbeat-2.preinst 8 Mar 2006 03:27:30 -0000 1.4
@@ -6,7 +6,7 @@
#
# see: dh_installdeb(1)
-/etc/init.d/heartbeat stop
+[ -x /etc/init.d/heartbeat ] && /etc/init.d/heartbeat stop
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
------------------------------
Message: 2
Date: Tue, 7 Mar 2006 20:29:43 -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 heartbeat.preinst
Log Message:
Debian Packaging Changes
* Don't try and stop heartbeat in preinst on the first install
(closes: #355806)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.17.2.36
retrieving revision 1.17.2.37
diff -u -3 -r1.17.2.36 -r1.17.2.37
--- changelog 14 Feb 2006 10:05:10 -0000 1.17.2.36
+++ changelog 8 Mar 2006 03:29:43 -0000 1.17.2.37
@@ -1,3 +1,10 @@
+heartbeat (1.2.4-5) unstable; urgency=low
+
+ * Don't try and stop heartbeat in preinst on the first install
+ (closes: #355806)
+
+ -- Simon Horman <[EMAIL PROTECTED]> Wed, 8 Mar 2006 09:49:54 +0900
+
heartbeat (1.2.4-4) unstable; urgency=low
* Move hacluster user and haclient group creation (don't ask me why the
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/Attic/heartbeat.preinst,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -3 -r1.1.2.4 -r1.1.2.5
--- heartbeat.preinst 14 Feb 2006 10:05:10 -0000 1.1.2.4
+++ heartbeat.preinst 8 Mar 2006 03:29:43 -0000 1.1.2.5
@@ -3,7 +3,7 @@
#
# see: dh_installdeb(1)
-/etc/init.d/heartbeat stop
+[ -x /etc/init.d/heartbeat ] && /etc/init.d/heartbeat stop
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
------------------------------
Message: 3
Date: Wed, 8 Mar 2006 08:46:53 -0700 (MST)
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/admin
Modified Files:
crm_attribute.c
Log Message:
Updates to crm_master logging - it should not be invoked directly by the
admin.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_attribute.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- crm_attribute.c 26 Jan 2006 11:36:58 -0000 1.7
+++ crm_attribute.c 8 Mar 2006 15:46:52 -0000 1.8
@@ -1,4 +1,4 @@
-/* $Id: crm_attribute.c,v 1.7 2006/01/26 11:36:58 andrew Exp $ */
+/* $Id: crm_attribute.c,v 1.8 2006/03/08 15:46:52 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -225,11 +225,12 @@
if(dest_node == NULL && dest_uname != NULL) {
rc = query_node_uuid(the_cib, dest_uname, &dest_node);
if(rc != cib_ok) {
- fprintf(stderr, "Could not map uname=%s to a UUID:
%s\n",
+ fprintf(stderr,"Could not map uname=%s to a UUID: %s\n",
dest_uname, cib_error2string(rc));
return rc;
} else {
- crm_info("Mapped %s to %s", dest_uname,
crm_str(dest_node));
+ crm_info("Mapped %s to %s",
+ dest_uname, crm_str(dest_node));
}
}
@@ -237,10 +238,6 @@
int len = 0;
char *rsc = NULL;
- if(dest_node == NULL) {
- fprintf(stderr, "Could not determin node UUID.\n");
- return 1;
- }
if(safe_str_eq(type, "reboot")) {
type = XML_CIB_TAG_STATUS;
} else {
@@ -251,6 +248,17 @@
CRM_DEV_ASSERT(rsc != NULL);
CRM_DEV_ASSERT(dest_node != NULL);
+ if(rsc == NULL && dest_node == NULL) {
+ fprintf(stderr, "This program should only ever be "
+ "invoked from inside an OCF resource agent.\n");
+ fprintf(stderr, "DO NOT INVOKE MANUALLY FROM THE
COMMAND LINE.\n");
+ return 1;
+
+ } else if(dest_node == NULL) {
+ fprintf(stderr, "Could not determin node UUID.\n");
+ return 1;
+ }
+
len = 8 + strlen(rsc);
crm_malloc0(attr_name, len);
sprintf(attr_name, "master-%s", rsc);
@@ -374,7 +382,8 @@
fprintf(stream, "\t--%s (-%c)\t: Print only the value on stdout"
" (use with -G)\n", "quiet", 'Q');
fprintf(stream, "\t--%s (-%c)\t: "
- "Retrieve rather than set the attribute\n", "get-value", 'G');
+ "Retrieve rather than set the %s\n", "get-value", 'G',
+ safe_str_eq(cmd, "crm_master")?"named attribute":"preference to
be promoted");
fprintf(stream, "\t--%s (-%c)\t: "
"Delete rather than set the attribute\n", "delete-attr", 'D');
fprintf(stream, "\t--%s (-%c) <string>\t: "
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 28, Issue 6
*******************************************
