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: heartbeat by gshi from
([email protected])
2. Linux-HA CVS: resources by alan from
([email protected])
3. Linux-HA CVS: resources by alan from
([email protected])
4. Linux-HA CVS: linux-ha by davidlee from
([email protected])
5. Linux-HA CVS: replace by davidlee from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 17 Nov 2005 15:42:14 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
hb_uuid.c
Log Message:
if it's a V1 style resource managment, we don't care about adding/deleting
nodes, therefore
no read/write on hostcache files
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/hb_uuid.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- hb_uuid.c 7 Nov 2005 23:04:52 -0000 1.18
+++ hb_uuid.c 17 Nov 2005 22:42:13 -0000 1.19
@@ -29,6 +29,8 @@
#include <unistd.h>
#include <clplumbing/cl_misc.h>
+extern int DoManageResources;
+
#ifndef O_SYNC
# define O_SYNC 0
#endif
@@ -704,6 +706,9 @@
int
write_cache_file(struct sys_config* cfg)
{
+ if (DoManageResources){
+ return HA_OK;
+ }
if (write_node_uuid_file(cfg) != HA_OK){
return HA_FAIL;
}
@@ -715,7 +720,10 @@
int
read_cache_file(struct sys_config* cfg)
{
-
+
+ if (DoManageResources){
+ return HA_OK;
+ }
if (read_node_uuid_file(cfg) != HA_OK){
return HA_FAIL;
}
------------------------------
Message: 2
Date: Thu, 17 Nov 2005 22:41:00 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
apache.in
Log Message:
Applied a patch to apache from Mizutani Koji
<mizutani.koji (at) nttcom do co dot jp>
to allow for both the AddModule and to LoadModule parameters as the same.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/apache.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- apache.in 3 Nov 2005 10:32:47 -0000 1.10
+++ apache.in 18 Nov 2005 05:41:00 -0000 1.11
@@ -181,14 +181,21 @@
# Return TRUE if the config file supports the given handler somewhere
#
SupportsHandler() {
- apache_param $1 SetHandler | grep "^ *$2 *" >/dev/null
+ apache_param "$1" SetHandler | grep "^ *$2 *" >/dev/null
}
#
# return true if the given module is loaded...
#
Module_loaded() {
- apache_param $1 AddModule | grep -i "^mod_$2\." >/dev/null
+ apache_param "$1" AddModule | grep -i "^mod_$2\." >/dev/null
+ if
+ [ $? = 0 ]
+ then
+ true
+ else
+ apache_param "$1" LoadModule | grep -i "mod_$2\." >/dev/null
+ fi
}
#
@@ -224,8 +231,8 @@
#
GetParams() {
ConfigFile=$1
- ServerRoot=`apache_param $ConfigFile ServerRoot`
- PidFile=`apache_param $ConfigFile PidFile`
+ ServerRoot=`apache_param "$ConfigFile" ServerRoot`
+ PidFile=`apache_param "$ConfigFile" PidFile`
case $PidFile in
/*) ;;
[[:alnum:]]*) PidFile=$ServerRoot/$PidFile;;
@@ -233,7 +240,7 @@
esac
# case "$PORT" in
# [0-9]*) ;;
-# *) PORT=`apache_param $ConfigFile Port`
+# *) PORT=`apache_param "$ConfigFile" Port`
# case "$PORT" in
# [0-9]*) ;;
# *) PORT=80;;
@@ -243,7 +250,7 @@
if CheckPort "$PORT"; then
:
else
- PORT=`apache_param $ConfigFile Port`
+ PORT=`apache_param "$ConfigFile" Port`
if CheckPort "$PORT"; then
:
else
------------------------------
Message: 3
Date: Thu, 17 Nov 2005 22:48:40 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
ocf-shellfuncs.in
Log Message:
Minor improvement to the OCF ocf_is_root() function...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ocf-shellfuncs.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ocf-shellfuncs.in 15 Nov 2005 04:22:30 -0000 1.23
+++ ocf-shellfuncs.in 18 Nov 2005 05:48:40 -0000 1.24
@@ -1,5 +1,5 @@
#
-# $Id: ocf-shellfuncs.in,v 1.23 2005/11/15 04:22:30 xunsun Exp $
+# $Id: ocf-shellfuncs.in,v 1.24 2005/11/18 05:48:40 alan Exp $
#
# Common helper functions for the OCF Resource Agents supplied by
# heartbeat.
@@ -41,8 +41,10 @@
. ${HA_D}/shellfuncs
ocf_is_root() {
- set `id`
- [ $1 = "uid=0(root)" ]
+ case `id` in
+ *'uid=0(root)'*) true;;
+ *) false;;
+ esac
}
# Portability comments:
------------------------------
Message: 4
Date: Fri, 18 Nov 2005 02:43:20 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Module : linux-ha
Dir : linux-ha/linux-ha
Modified Files:
portability.h
Log Message:
replace/{setenv.c,unsetenv.c}: rationalise declarations and convey return data
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/linux-ha/portability.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- portability.h 9 Nov 2005 15:07:18 -0000 1.49
+++ portability.h 18 Nov 2005 09:43:19 -0000 1.50
@@ -1,4 +1,4 @@
-/* $Id: portability.h,v 1.49 2005/11/09 15:07:18 davidlee Exp $ */
+/* $Id: portability.h,v 1.50 2005/11/18 09:43:19 davidlee Exp $ */
#ifndef PORTABILITY_H
# define PORTABILITY_H
@@ -67,7 +67,7 @@
#ifndef HA_HAVE_UNSETENV
/* We supply a replacement function, but need a prototype */
-int unsetenv(const char *name);
+void unsetenv(const char *name);
#endif /* HA_HAVE_UNSETENV */
#ifndef HA_HAVE_STRERROR
------------------------------
Message: 5
Date: Fri, 18 Nov 2005 02:43:20 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: replace by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Project : linux-ha
Module : replace
Dir : linux-ha/replace
Modified Files:
setenv.c unsetenv.c
Log Message:
replace/{setenv.c,unsetenv.c}: rationalise declarations and convey return data
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/replace/setenv.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- setenv.c 17 Feb 2004 22:12:01 -0000 1.5
+++ setenv.c 18 Nov 2005 09:43:19 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Id: setenv.c,v 1.5 2004/02/17 22:12:01 lars Exp $ */
+/* $Id: setenv.c,v 1.6 2005/11/18 09:43:19 davidlee Exp $ */
/*
* Copyright (C) 2001 Alan Robertson <[EMAIL PROTECTED]>
* This software licensed under the GNU LGPL.
@@ -19,17 +19,18 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+#include <portability.h>
#include <stdlib.h>
#include <stdio.h>
-int setenv(const char *name, const char * value, int why);
-
/*
* Small replacement function for setenv()
*/
int
setenv(const char *name, const char * value, int why)
{
+ int rc = -1;
+
if ( name && value ) {
char * envp = NULL;
envp = malloc(strlen(name)+strlen(value)+2);
@@ -42,11 +43,9 @@
sprintf(envp, "%s=%s", name, value);
/* Cannot free envp (!) */
- putenv(envp);
-
- return(0);
+ rc = putenv(envp);
}
}
- return(-1);
+ return(rc);
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/replace/unsetenv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- unsetenv.c 17 Feb 2004 22:12:01 -0000 1.3
+++ unsetenv.c 18 Nov 2005 09:43:19 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: unsetenv.c,v 1.3 2004/02/17 22:12:01 lars Exp $ */
+/* $Id: unsetenv.c,v 1.4 2005/11/18 09:43:19 davidlee Exp $ */
/*
* Copyright (C) 2001 Alan Robertson <[EMAIL PROTECTED]>
* This software licensed under the GNU LGPL.
@@ -20,6 +20,7 @@
*
*/
+#include <portability.h>
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
@@ -30,9 +31,6 @@
extern char **environ;
#endif
-
-void unsetenv(const char *name);
-
void
unsetenv (const char *name)
{
------------------------------
_______________________________________________
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 58
********************************************
