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: resources by lars from
([email protected])
2. Linux-HA CVS: linux-ha by lars from
([email protected])
3. Linux-HA CVS: linux-ha by lars from
([email protected])
4. Linux-HA CVS: crm by lars from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 19 May 2006 07:58:17 -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:
Errors should go to the bit bucket here.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Filesystem.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- Filesystem.in 19 May 2006 12:50:06 -0000 1.20
+++ Filesystem.in 19 May 2006 13:58:16 -0000 1.21
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Filesystem.in,v 1.20 2006/05/19 12:50:06 lars Exp $
+# $Id: Filesystem.in,v 1.21 2006/05/19 13:58:16 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.20 2006/05/19 12:50:06 lars Exp $
+ $Id: Filesystem.in,v 1.21 2006/05/19 13:58:16 lars Exp $
EOT
}
@@ -636,7 +636,7 @@
if [ -n "$OCF_RESKEY_ocfs2_cluster" ]; then
OCFS2_CLUSTER=$(echo $OCF_RESKEY_ocfs2_cluster | tr a-z A-Z)
else
- OCFS2_CLUSTER=$(find "$OCFS2_CONFIGFS" -maxdepth 1 -mindepth 1
-type d -printf %f 2>&1)
+ OCFS2_CLUSTER=$(find "$OCFS2_CONFIGFS" -maxdepth 1 -mindepth 1
-type d -printf %f 2>/dev/null)
set -- $OCFS2_CLUSTER
local n="$#"
if [ $n -gt 1 ]; then
------------------------------
Message: 2
Date: Fri, 19 May 2006 08:24:59 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Allow package version to be overriden in configure. Useful for playing
pretend ;-)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -3 -r1.514 -r1.515
--- configure.in 11 May 2006 22:43:15 -0000 1.514
+++ configure.in 19 May 2006 14:24:58 -0000 1.515
@@ -10,14 +10,26 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.514 $) dnl cvs revision
+AC_REVISION($Revision: 1.515 $) dnl cvs revision
AC_CANONICAL_HOST
dnl Where #defines go (e.g. `AC_CHECK_HEADERS' below)
AM_CONFIG_HEADER(linux-ha/config.h include/ha_config.h)
ALL_LINGUAS="en fr"
-AM_INIT_AUTOMAKE(heartbeat, 2.0.6)
+
+AC_ARG_WITH(pkgversion,
+ [ --with-pkgversion=name Override package version (if you're a
packager needing to pretend) ],
+ [ PKGVERSION="$withval" ],
+ [ PKGVERSION="" ],
+)
+
+if [ -n "$PKGVERSION" ]; then
+ AM_INIT_AUTOMAKE(heartbeat, $PKGVERSION)
+else
+ AM_INIT_AUTOMAKE(heartbeat, 2.0.6)
+fi
+
RPMREL=1
AC_SUBST(RPMREL)
HB_PKG=heartbeat
------------------------------
Message: 3
Date: Fri, 19 May 2006 08:27:09 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
I should know better than to write such unportable code.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -3 -r1.515 -r1.516
--- configure.in 19 May 2006 14:24:58 -0000 1.515
+++ configure.in 19 May 2006 14:27:08 -0000 1.516
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.515 $) dnl cvs revision
+AC_REVISION($Revision: 1.516 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -24,7 +24,7 @@
[ PKGVERSION="" ],
)
-if [ -n "$PKGVERSION" ]; then
+if test x"$PKGVERSION" != x; then
AM_INIT_AUTOMAKE(heartbeat, $PKGVERSION)
else
AM_INIT_AUTOMAKE(heartbeat, 2.0.6)
------------------------------
Message: 4
Date: Fri, 19 May 2006 11:17:46 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/admin
Modified Files:
crm_resource.c
Log Message:
Assigned the same id as the resource to the attribute set; prefix with
"cli-ias-" instead.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_resource.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- crm_resource.c 16 May 2006 15:25:19 -0000 1.30
+++ crm_resource.c 19 May 2006 17:17:45 -0000 1.31
@@ -1,4 +1,4 @@
-/* $Id: crm_resource.c,v 1.30 2006/05/16 15:25:19 andrew Exp $ */
+/* $Id: crm_resource.c,v 1.31 2006/05/19 17:17:45 lars Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -202,7 +202,7 @@
}
if(attr_set == NULL) {
- local_attr_set = crm_strdup(rsc->id);
+ local_attr_set = crm_concat("cli-ias", rsc_id, '-');
attr_set = local_attr_set;
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 60
********************************************
