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: tools by andrew from
([email protected])
2. Linux-HA CVS: resources by andrew from
([email protected])
3. Linux-HA CVS: resources by andrew from
([email protected])
4. Linux-HA CVS: resources by lars from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 1 Jun 2006 05:32:58 -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:
ccdv.c
Log Message:
Tweak to parse command line options better when use full pathnames
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/ccdv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ccdv.c 29 Jul 2005 06:17:44 -0000 1.3
+++ ccdv.c 1 Jun 2006 11:32:58 -0000 1.4
@@ -284,14 +284,14 @@
strcpy(gAction, "Linking");
snprintf(gTarget, sizeof(gTarget), "%s",
Basename(argv[i + 1]));
}
- } else if (strchr("-+/", (int) argv[i][0]) != NULL) {
- continue;
} else if (strncasecmp(Extension(argv[i]), ".c", 2) == 0) {
cc++;
snprintf(gTarget, sizeof(gTarget), "%s",
Basename(argv[i]));
} else if ((strncasecmp(Extension(argv[i]), ".h", 2) == 0) &&
(cc == 0)) {
pch++;
snprintf(gTarget, sizeof(gTarget), "%s",
Basename(argv[i]));
+ } else if (strchr("-+/", (int) argv[i][0]) != NULL) {
+ continue;
} else if ((i == 1) && (strcmp(Basename(argv[i]), "ar") == 0)) {
snprintf(gAr, sizeof(gAr), "%s", Basename(argv[i]));
} else if ((gArLibraryTarget[0] == '\0')
------------------------------
Message: 2
Date: Thu, 1 Jun 2006 06:29:00 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
SysInfo.in
Log Message:
Fix for multi-word values
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/SysInfo.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- SysInfo.in 1 Jun 2006 08:44:40 -0000 1.1
+++ SysInfo.in 1 Jun 2006 12:29:00 -0000 1.2
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: SysInfo.in,v 1.1 2006/06/01 08:44:40 andrew Exp $
+# $Id: SysInfo.in,v 1.2 2006/06/01 12:29:00 andrew Exp $
#
# SysInfo OCF RA. Does nothing but wait a few seconds, can be
# configured to fail occassionally.
@@ -112,8 +112,10 @@
#######################################################################
UpdateStat() {
- echo -e "$1:\t$2"
- @sbindir@/attrd_updater ${OCF_RESKEY_delay} -s ${OCF_RESOURCE_INSTANCE} -S
status -n $1 -v $2
+ name=$1; shift
+ value="$*"
+ echo -e "$name:\t$value"
+ @sbindir@/attrd_updater ${OCF_RESKEY_delay} -s
${OCF_RESOURCE_INSTANCE}-node-attrs -S status -n $name -v "$value"
}
SysInfoStats() {
------------------------------
Message: 3
Date: Thu, 1 Jun 2006 06:42:23 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
SysInfo.in
Log Message:
Use the automatic section name
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/SysInfo.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- SysInfo.in 1 Jun 2006 12:29:00 -0000 1.2
+++ SysInfo.in 1 Jun 2006 12:42:23 -0000 1.3
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: SysInfo.in,v 1.2 2006/06/01 12:29:00 andrew Exp $
+# $Id: SysInfo.in,v 1.3 2006/06/01 12:42:23 andrew Exp $
#
# SysInfo OCF RA. Does nothing but wait a few seconds, can be
# configured to fail occassionally.
@@ -115,7 +115,7 @@
name=$1; shift
value="$*"
echo -e "$name:\t$value"
- @sbindir@/attrd_updater ${OCF_RESKEY_delay} -s
${OCF_RESOURCE_INSTANCE}-node-attrs -S status -n $name -v "$value"
+ @sbindir@/attrd_updater ${OCF_RESKEY_delay} -S status -n $name -v "$value"
}
SysInfoStats() {
------------------------------
Message: 4
Date: Thu, 1 Jun 2006 07:40:31 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
Filesystem.in
Log Message:
The then which is double is not the true then. Ommm.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Filesystem.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- Filesystem.in 31 May 2006 22:08:10 -0000 1.26
+++ Filesystem.in 1 Jun 2006 13:40:30 -0000 1.27
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Filesystem.in,v 1.26 2006/05/31 22:08:10 lars Exp $
+# $Id: Filesystem.in,v 1.27 2006/06/01 13:40:30 lars Exp $
#
# Support: [EMAIL PROTECTED]
# License: GNU General Public License (GPL)
@@ -95,7 +95,7 @@
usage() {
cat <<-EOT
usage: $0 {start|stop|status|monitor|validate-all|meta-data}
- $Id: Filesystem.in,v 1.26 2006/05/31 22:08:10 lars Exp $
+ $Id: Filesystem.in,v 1.27 2006/06/01 13:40:30 lars Exp $
EOT
}
@@ -440,7 +440,6 @@
# See if the device is currently mounted
Filesystem_status >/dev/null 2>&1
if [ $? -ne $OCF_NOT_RUNNING ]; then
- then
# Umount all sub-filesystems mounted under $MOUNTPOINT/
# (e.g. /proc in chroots)
for SUB in `$MOUNT | grep "on $MOUNTPOINT/" | cut -d' ' -f3 | tac`
; do
------------------------------
Message: 5
Date: Thu, 1 Jun 2006 08:45:55 -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/pengine
Modified Files:
incarnation.c
Log Message:
Novell #180799: Multiple probes scheduled for non-unique clone
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- incarnation.c 1 Jun 2006 10:38:39 -0000 1.94
+++ incarnation.c 1 Jun 2006 14:45:55 -0000 1.95
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.94 2006/06/01 10:38:39 andrew Exp $ */
+/* $Id: incarnation.c,v 1.95 2006/06/01 14:45:55 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1423,10 +1423,15 @@
slist_iter(
child_rsc, resource_t, clone_data->child_list, lpc,
- /* we may already be running but under different names */
if(rsc->globally_unique == FALSE
- && clone_data->clone_node_max == 1
- && pe_find_node_id(child_rsc->known_on, node->details->id)) {
+ && clone_data->clone_node_max == 1) {
+ /* only look for one copy */
+ if(pe_find_node_id(child_rsc->known_on,
node->details->id) == NULL) {
+ if(child_rsc->fns->create_probe(
+ child_rsc, node, complete, force,
data_set)) {
+ any_created = TRUE;
+ }
+ }
break;
} else if(child_rsc->fns->create_probe(
------------------------------
_______________________________________________
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 4
*******************************************
