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 blaschke from
([email protected])
2. Linux-HA CVS: resources by davidlee from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 10 Nov 2005 09:52:53 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by blaschke from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : blaschke
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/stonith
Modified Files:
apcmaster.c
Log Message:
No need to make BEAM happy, this is a BEAM bug in handling of backward
gotos that will be fixed
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/apcmaster.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- apcmaster.c 9 Nov 2005 08:42:24 -0000 1.26
+++ apcmaster.c 10 Nov 2005 16:52:46 -0000 1.27
@@ -1,4 +1,4 @@
-/* $Id: apcmaster.c,v 1.26 2005/11/09 08:42:24 sunjd Exp $ */
+/* $Id: apcmaster.c,v 1.27 2005/11/10 16:52:46 blaschke Exp $ */
/*
*
* Copyright 2001 Mission Critical Linux, Inc.
@@ -51,7 +51,7 @@
/*
* Version string that is filled in by CVS
*/
-static const char *version __attribute__ ((unused)) = "$Revision: 1.26 $";
+static const char *version __attribute__ ((unused)) = "$Revision: 1.27 $";
#define DEVICE "APC MasterSwitch"
@@ -321,7 +321,6 @@
case 1: /* Got that annoying command confirmation :-( */
SEND(ms->wrfd, "YES\r");
goto retry;
- break;
default:
return(errno == ETIMEDOUT ? S_RESETFAIL : S_OOPS);
@@ -406,7 +405,6 @@
case 1: /* Got that annoying command confirmation :-( */
SEND(ms->wrfd, "YES\r");
goto retry;
- break; /* make BEAM happy */
default:
return(errno == ETIMEDOUT ? S_RESETFAIL : S_OOPS);
------------------------------
Message: 2
Date: Thu, 10 Nov 2005 10:18:16 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/heartbeat
Modified Files:
hto-mapfuncs.in
Log Message:
Fix some portability bugs ("sh" is not "bash" on many (most?) UN*X systems)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/heartbeat/hto-mapfuncs.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- hto-mapfuncs.in 9 Nov 2005 12:05:50 -0000 1.8
+++ hto-mapfuncs.in 10 Nov 2005 17:18:16 -0000 1.9
@@ -23,15 +23,9 @@
ra_getpathname
- if [ ! -e $RAOCFPATH ]
- then
- ha_log "ERR $RAOCFPATH is not in existence"
- exit 1
- fi
-
if [ ! -x $RAOCFPATH ]
then
- ha_log "ERR $RAOCFPATH is'nt executable file "
+ ha_log "ERR $RAOCFPATH is not an executable file "
exit 1
fi
@@ -105,9 +99,9 @@
setup_OCF_env_vars $RSCTYPEPAIR
setup_OCF_env_vars $PROVIDERPAIR
- export "OCF_RA_VERSION_MAJOR"=1
- export "OCF_RA_VERSION_MINOR"=0
- export "OCF_ROOT"=$OCF_ROOT_DIR
+ OCF_RA_VERSION_MAJOR=1 ; export OCF_RA_VERSION_MAJOR
+ OCF_RA_VERSION_MINOR=0 ; export OCF_RA_VERSION_MINOR
+ OCF_ROOT=$OCF_ROOT_DIR ; export OCF_ROOT
. @hb_libdir@/ocf-shellfuncs
}
@@ -136,7 +130,8 @@
hbvarvalue=`echo "$envar" | cut -d${PARAMETER_SPLIT_SIGN} -f2`
ocfvarname="OCF_RESKEY_${hbvarname}"
- export $ocfvarname=$hbvarvalue
+ eval $ocfvarname=$hbvarvalue
+ export $ocfvarname
}
setup_OCF_env_vars(){
@@ -148,22 +143,24 @@
if [ ! -z "$hbvarvalue" ]
then
ocfvarname="OCF_RESOURCE_INSTANCE"
- export $ocfvarname=$hbvarvalue
+ eval $ocfvarname=$hbvarvalue
+ export $ocfvarname
fi
;;
rsc_type)
if [ ! -z "hbvarvalue" ]
then
- export "$1"
ocfvarname="OCF_RESOURCE_TYPE"
- export $ocfvarname=$hbvarvalue
+ eval $ocfvarname=$hbvarvalue
+ export $ocfvarname
fi
;;
provider)
if [ ! -z "hbvarvalue" ]
then
ocfvarname="OCF_RESOURCE_PROVIDER"
- export $ocfvarname=$hbvarvalue
+ eval $ocfvarname=$hbvarvalue
+ export $ocfvarname
fi
;;
*)
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 24, Issue 45
********************************************
