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: resources by xunsun from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 9 Mar 2006 19:20:02 -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
Log Message:
Debian Packaging Changes
+ * Removed build depenancy on openssl-devel,
+ as heartbeat no longer uses openssl directly.
+ (Libraries that heartbeat depends on may in turn
+ depend on openssl creating an indirect depenancy
+ or build-dependancy).
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- changelog 8 Mar 2006 03:27:30 -0000 1.61
+++ changelog 10 Mar 2006 02:20:01 -0000 1.62
@@ -1,3 +1,13 @@
+heartbeat-2 (2.0.4-2) UNRELEASED; urgency=low
+
+ * Removed build depenancy on openssl-devel,
+ as heartbeat no longer uses openssl directly.
+ (Libraries that heartbeat depends on may in turn
+ depend on openssl creating an indirect depenancy
+ or build-dependancy).
+
+ -- Simon Horman <[EMAIL PROTECTED]> Fri, 10 Mar 2006 10:12:24 +0900
+
heartbeat-2 (2.0.4-1) unstable; urgency=low
* New Upstream
------------------------------
Message: 2
Date: Thu, 9 Mar 2006 21:14:21 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by xunsun from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : xunsun
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
AudibleAlarm.in ClusterMon.in Delay.in Dummy.in Filesystem.in
ICP.in IPaddr.in IPaddr2.in IPsrcaddr.in IPv6addr.c LVM.in
LinuxSCSI.in MailTo.in Raid1.in ServeRAID.in WAS.in
WinPopup.in Xinetd.in apache.in db2.in drbd.in
ocf-shellfuncs.in portblock.in
Log Message:
backed out the former patch, renamed run() to ocf_run()
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/AudibleAlarm.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- AudibleAlarm.in 9 Mar 2006 12:55:10 -0000 1.8
+++ AudibleAlarm.in 10 Mar 2006 04:14:20 -0000 1.9
@@ -30,7 +30,7 @@
echo "Usage: $0
{start|stop|restart|status|monitor|meta-data|validate-all}"
echo " The node list is an optional space delimited"
echo " list of hosts that should never sound the alarm."
- echo "$Id: AudibleAlarm.in,v 1.8 2006/03/09 12:55:10 xunsun Exp $";
+ echo "$Id: AudibleAlarm.in,v 1.9 2006/03/10 04:14:20 xunsun Exp $";
}
meta_data() {
@@ -127,7 +127,7 @@
PID=`head -n 1 $PIDFILE`
if [ -n "$PID" ]; then
echo running
- return `return_master $OCF_SUCCESS`
+ return $OCF_SUCCESS
fi
fi
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ClusterMon.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ClusterMon.in 9 Mar 2006 12:55:10 -0000 1.9
+++ ClusterMon.in 10 Mar 2006 04:14:20 -0000 1.10
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: ClusterMon.in,v 1.9 2006/03/09 12:55:10 xunsun Exp $
+# $Id: ClusterMon.in,v 1.10 2006/03/10 04:14:20 xunsun Exp $
#
# ClusterMon OCF RA. Does nothing but wait a few seconds, can be
# configured to fail occassionally.
@@ -159,7 +159,7 @@
if [ ! -z $pid ]; then
kill -0 $pid
if [ $? = 0 ]; then
- return `return_master $OCF_SUCCESS`
+ exit $OCF_SUCCESS
fi
fi
exit $OCF_NOT_RUNNING
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Delay.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Delay.in 9 Mar 2006 12:55:10 -0000 1.10
+++ Delay.in 10 Mar 2006 04:14:20 -0000 1.11
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Delay.in,v 1.10 2006/03/09 12:55:10 xunsun Exp $
+# $Id: Delay.in,v 1.11 2006/03/10 04:14:20 xunsun Exp $
#
# Support: [EMAIL PROTECTED]
# License: GNU General Public License (GPL)
@@ -36,7 +36,7 @@
usage() {
cat <<-!
usage: $0 {start|stop|status|monitor|meta-data|validate-all}
- $Id: Delay.in,v 1.10 2006/03/09 12:55:10 xunsun Exp $
+ $Id: Delay.in,v 1.11 2006/03/10 04:14:20 xunsun Exp $
!
}
@@ -102,7 +102,7 @@
Delay_stat
then
ocf_log info "Delay is running OK"
- return_master $OCF_SUCCESS
+ return $OCF_SUCCESS
else
ocf_log info "Delay is stopped"
return $OCF_NOT_RUNNING
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Dummy.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Dummy.in 9 Mar 2006 12:55:10 -0000 1.3
+++ Dummy.in 10 Mar 2006 04:14:20 -0000 1.4
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Dummy.in,v 1.3 2006/03/09 12:55:10 xunsun Exp $
+# $Id: Dummy.in,v 1.4 2006/03/10 04:14:20 xunsun Exp $
#
# Dummy OCF RA. Does nothing but wait a few seconds, can be
# configured to fail occassionally.
@@ -114,7 +114,6 @@
dummy_monitor() {
sleep $OCF_RESKEY_monitor_delay
- return_monitor $?
}
dummy_validate() {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Filesystem.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Filesystem.in 9 Mar 2006 12:55:10 -0000 1.16
+++ Filesystem.in 10 Mar 2006 04:14:20 -0000 1.17
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Filesystem.in,v 1.16 2006/03/09 12:55:10 xunsun Exp $
+# $Id: Filesystem.in,v 1.17 2006/03/10 04:14:20 xunsun 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.16 2006/03/09 12:55:10 xunsun Exp $
+ $Id: Filesystem.in,v 1.17 2006/03/10 04:14:20 xunsun Exp $
EOT
}
@@ -348,7 +348,7 @@
case "$OP" in
status) ocf_log info "$msg";;
esac
- return_master $rc
+ return $rc
}
# end of Filesystem_status
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ICP.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ICP.in 9 Mar 2006 12:55:10 -0000 1.6
+++ ICP.in 10 Mar 2006 04:14:20 -0000 1.7
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: ICP.in,v 1.6 2006/03/09 12:55:10 xunsun Exp $
+# $Id: ICP.in,v 1.7 2006/03/10 04:14:20 xunsun Exp $
#
# ICP
#
@@ -53,7 +53,7 @@
The 'validate-all' operation reports whether OCF instance parameters
are valid.
The 'methods' operation reports on the methods $0 supports
- $Id: ICP.in,v 1.6 2006/03/09 12:55:10 xunsun Exp $
+ $Id: ICP.in,v 1.7 2006/03/10 04:14:20 xunsun Exp $
!
}
@@ -160,7 +160,7 @@
if
ICP_status $1
then
- return_master $?
+ return $?
else
ocf_log "err" "ICP host drive $1 is offline"
return $OCF_NOT_RUNNING
@@ -178,10 +178,10 @@
ICP_start() {
ocf_log "info" "Activating host drive $1"
- run $ICPCLUCON -v -reserve $1
+ ocf_run $ICPCLUCON -v -reserve $1
if [ $? -ne 0 ]; then
ocf_log "info" "Forcing reservation of $1"
- run $ICPCLUCON -v -force $1 || return $OCF_ERR_GENERIC
+ ocf_run $ICPCLUCON -v -force $1 || return $OCF_ERR_GENERIC
fi
if
@@ -203,7 +203,7 @@
ICP_stop() {
ocf_log "info" "Releasing ICP host drive $1"
- run $ICPCLUCON -v -release $1 || return $OCF_ERR_GENERIC
+ ocf_run $ICPCLUCON -v -release $1 || return $OCF_ERR_GENERIC
ocf_log "info" "Verifying reservation"
if ICP_status $1 ; then
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- IPaddr.in 9 Mar 2006 12:55:10 -0000 1.37
+++ IPaddr.in 10 Mar 2006 04:14:20 -0000 1.38
@@ -796,11 +796,11 @@
for j in 1 2 3; do
if @PING@ $PINGARGS >/dev/null 2>&1 ; then
- return `return_master $OCF_SUCCESS`
+ return $OCF_SUCCESS
fi
done
- return `return_master $OCF_ERR_GENERIC`
+ return $OCF_ERR_GENERIC
}
is_positive_integer() {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr2.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- IPaddr2.in 9 Mar 2006 12:55:10 -0000 1.16
+++ IPaddr2.in 10 Mar 2006 04:14:20 -0000 1.17
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: IPaddr2.in,v 1.16 2006/03/09 12:55:10 xunsun Exp $
+# $Id: IPaddr2.in,v 1.17 2006/03/10 04:14:20 xunsun Exp $
#
# OCF Resource Agent compliant IPaddr2 script.
#
@@ -648,14 +648,14 @@
# interface health maybe via a daemon like FailSafe etc...
case `ip_served $BASEIP` in
ok)
- return_master $OCF_SUCCESS
+ return $OCF_SUCCESS
;;
partial|no)
exit $OCF_NOT_RUNNING
;;
*)
# Errors on this interface?
- return_master $OCF_ERR_GENERIC
+ return $OCF_ERR_GENERIC
;;
esac
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPsrcaddr.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- IPsrcaddr.in 9 Mar 2006 12:55:10 -0000 1.5
+++ IPsrcaddr.in 10 Mar 2006 04:14:20 -0000 1.6
@@ -194,13 +194,13 @@
case $? in
0) echo "OK"
- return_master $OCF_SUCCESS;;
+ return $OCF_SUCCESS;;
1) echo "No preferred source address defined"
return $OCF_NOT_RUNNING;;
2) echo "Preferred source address has incorrect value"
- return_master $OCF_ERR_GENERIC;;
+ return $OCF_ERR_GENERIC;;
esac
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPv6addr.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- IPv6addr.c 9 Mar 2006 12:55:10 -0000 1.10
+++ IPv6addr.c 10 Mar 2006 04:14:20 -0000 1.11
@@ -81,7 +81,6 @@
* return 0(OCF_SUCCESS) for response correctly.
* return 1(OCF_NOT_RUNNING) for no response.
* return 2(OCF_ERR_ARGS) for invalid or excess argument(s)
- * return 8(OCF_RUNNING_MASTER) for running in "master" mode
*/
#include <portability.h>
@@ -125,8 +124,6 @@
#define OCF_ERR_INSTALLED 5
#define OCF_ERR_CONFIGURED 6
#define OCF_NOT_RUNNING 7
-#define OCF_RUNNING_MASTER 8
-#define OCF_FAILED_MASTER 9
const char* IF_INET6 = "/proc/net/if_inet6";
const char* APP_NAME = "IPv6addr";
@@ -372,11 +369,7 @@
int
monitor_addr6(struct in6_addr* addr6, int prefix_len)
{
- char* interval;
if(0 == is_addr6_available(addr6)) {
- interval = getenv("OCF_RESKEY_interval");
- if (interval && atoi(interval) == 0)
- return OCF_RUNNING_MASTER;
return OCF_SUCCESS;
}
return OCF_NOT_RUNNING;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/LVM.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- LVM.in 9 Mar 2006 12:55:10 -0000 1.11
+++ LVM.in 10 Mar 2006 04:14:20 -0000 1.12
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: LVM.in,v 1.11 2006/03/09 12:55:10 xunsun Exp $
+# $Id: LVM.in,v 1.12 2006/03/10 04:14:20 xunsun Exp $
#
# LVM
#
@@ -48,7 +48,7 @@
The 'validate-all' operation checks whether the OCF parameters are valid
The 'methods' operation reports on the methods $0 supports
- $Id: LVM.in,v 1.11 2006/03/09 12:55:10 xunsun Exp $
+ $Id: LVM.in,v 1.12 2006/03/10 04:14:20 xunsun Exp $
!
exit $OCF_ERR_GENERIC
@@ -174,9 +174,9 @@
return $OCF_NOT_RUNNING
fi
- run vgck $1
+ ocf_run vgck $1
- return_master $?
+ return $?
}
#
@@ -189,12 +189,12 @@
if
[ "$LVM_MAJOR" -eq "1" ]
then
- run vgscan $1
+ ocf_run vgscan $1
else
- run vgscan
+ ocf_run vgscan
fi
- run vgchange -a y $1 || return $OCF_ERR_GENERIC
+ ocf_run vgchange -a y $1 || return $OCF_ERR_GENERIC
if
LVM_status $1
@@ -213,7 +213,7 @@
LVM_stop() {
ocf_log info "Deactivating volume group $1"
- run vgchange -a n $1 || return 1
+ ocf_run vgchange -a n $1 || return 1
if
LVM_status $1
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/LinuxSCSI.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- LinuxSCSI.in 9 Mar 2006 12:55:10 -0000 1.8
+++ LinuxSCSI.in 10 Mar 2006 04:14:20 -0000 1.9
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: LinuxSCSI.in,v 1.8 2006/03/09 12:55:10 xunsun Exp $
+# $Id: LinuxSCSI.in,v 1.9 2006/03/10 04:14:20 xunsun Exp $
#
# LinuxSCSI
#
@@ -98,7 +98,7 @@
keep in the volumes. If you don't use a reasonable volume manager,
then you'll have to mount by UUID.
- $Id: LinuxSCSI.in,v 1.8 2006/03/09 12:55:10 xunsun Exp $
+ $Id: LinuxSCSI.in,v 1.9 2006/03/10 04:14:20 xunsun Exp $
!
}
@@ -282,7 +282,7 @@
scsi_status $instance
then
ocf_log info "SCSI device $instance is running"
- return_master $OCF_SUCCESS
+ return $OCF_SUCCESS
else
ocf_log info "SCSI device $instance is stopped"
exit $OCF_NOT_RUNNING
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/MailTo.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- MailTo.in 9 Mar 2006 12:55:10 -0000 1.7
+++ MailTo.in 10 Mar 2006 04:14:20 -0000 1.8
@@ -39,7 +39,7 @@
usage() {
echo "Usage: $0 {start|stop|status|monitor|meta-data|validate-all}"
- echo "$Id: MailTo.in,v 1.7 2006/03/09 12:55:10 xunsun Exp $"
+ echo "$Id: MailTo.in,v 1.8 2006/03/10 04:14:20 xunsun Exp $"
}
meta_data() {
@@ -125,7 +125,7 @@
if [ -f $MAILTOFILE ]; then
echo "running"
- return_master $OCF_SUCCESS
+ return $OCF_SUCCESS
else
echo "stopped"
return $OCF_NOT_RUNNING
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Raid1.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Raid1.in 9 Mar 2006 12:55:10 -0000 1.9
+++ Raid1.in 10 Mar 2006 04:14:20 -0000 1.10
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Raid1.in,v 1.9 2006/03/09 12:55:10 xunsun Exp $
+# $Id: Raid1.in,v 1.10 2006/03/10 04:14:20 xunsun Exp $
#
# License: GNU General Public License (GPL)
# Support: [EMAIL PROTECTED]
@@ -123,7 +123,7 @@
usage() {
cat <<-EOT
usage: $0 {start|stop|status|monitor|validate-all|usage|meta-data}
- $Id: Raid1.in,v 1.9 2006/03/09 12:55:10 xunsun Exp $
+ $Id: Raid1.in,v 1.10 2006/03/10 04:14:20 xunsun Exp $
EOT
}
@@ -278,7 +278,7 @@
return $OCF_NOT_RUNNING
else
echo "running"
- return_master $OCF_SUCCESS
+ return $OCF_SUCCESS
fi
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ServeRAID.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ServeRAID.in 9 Mar 2006 12:55:10 -0000 1.9
+++ ServeRAID.in 10 Mar 2006 04:14:20 -0000 1.10
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: ServeRAID.in,v 1.9 2006/03/09 12:55:10 xunsun Exp $
+# $Id: ServeRAID.in,v 1.10 2006/03/10 04:14:20 xunsun Exp $
#
# ServeRAID
#
@@ -104,7 +104,7 @@
You will need at least version 6.10 (~July 2003 release) of the ipssend
command for this script to work.
- $Id: ServeRAID.in,v 1.9 2006/03/09 12:55:10 xunsun Exp $
+ $Id: ServeRAID.in,v 1.10 2006/03/10 04:14:20 xunsun Exp $
!
}
@@ -297,7 +297,7 @@
ServeRAID_start() {
parseinst "$@"
if
- run $IPS UNMERGE $sr_adapter $sr_mergegroup
+ ocf_run $IPS UNMERGE $sr_adapter $sr_mergegroup
then
if
#
@@ -310,7 +310,7 @@
then
ocf_log info "$out"
else
- run $IPS MERGE $sr_adapter $sr_mergegroup OWN
+ ocf_run $IPS MERGE $sr_adapter $sr_mergegroup OWN
fi
then
: OK All is well!
@@ -321,7 +321,7 @@
# ServeRAID support CD.
# To avoid issues when called by lrmd, redirect stdout->stderr.
# Use () to create a subshell to make the redirection be synchronized.
- ( run $IPS SYNCH $sr_adapter GROUP $sr_mergegroup & ) >&2
+ ( ocf_run $IPS SYNCH $sr_adapter GROUP $sr_mergegroup & ) >&2
AddSCSI
else
return $?
@@ -347,7 +347,7 @@
parseinst "$@"
ReleaseSCSI
if
- run $IPS UNMERGE $sr_adapter $sr_mergegroup
+ ocf_run $IPS UNMERGE $sr_adapter $sr_mergegroup
then
: UNMERGE $sr_adapter $sr_mergegroup worked
fi
@@ -435,7 +435,7 @@
ServeRAID_status $serveraid $mergegroup
then
ocf_log debug "ServeRAID merge group $serveraid $mergegroup is
running."
- return_master $OCF_SUCCESS
+ return $OCF_SUCCESS
else
ocf_log debug "ServeRAID merge group $serveraid $mergegroup is
stopped."
exit $OCF_NOT_RUNNING
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/WAS.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- WAS.in 9 Mar 2006 12:55:10 -0000 1.10
+++ WAS.in 10 Mar 2006 04:14:20 -0000 1.11
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: WAS.in,v 1.10 2006/03/09 12:55:10 xunsun Exp $
+# $Id: WAS.in,v 1.11 2006/03/10 04:14:20 xunsun Exp $
#
# WAS
#
@@ -99,7 +99,7 @@
We run servlet/snoop on the first transport port listed in
the config file for the "monitor" operation.
- $Id: WAS.in,v 1.10 2006/03/09 12:55:10 xunsun Exp $
+ $Id: WAS.in,v 1.11 2006/03/10 04:14:20 xunsun Exp $
!
}
@@ -348,7 +348,7 @@
rc=$OCF_ERR_GENERIC
fi
rm -fr $tmpfile
- return_master $rc
+ return $rc
}
#
@@ -381,7 +381,7 @@
fi
if
- run $cmd
+ ocf_run $cmd
then
if
WAS_wait_4_start $STARTTIME "$@"
@@ -433,7 +433,7 @@
if
[ -x $WASBIN/stopServer.sh ]
then
- run $WASBIN/stopServer.sh -configFile $1
+ ocf_run $WASBIN/stopServer.sh -configFile $1
else
WASPorts=`GetWASPorts $1`
kill `WASPIDs $WASPorts`
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/WinPopup.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- WinPopup.in 9 Mar 2006 12:55:10 -0000 1.6
+++ WinPopup.in 10 Mar 2006 04:14:20 -0000 1.7
@@ -30,7 +30,7 @@
usage() {
echo "Usage: $0 {start|stop|status|monitor|validate-all|meta-data}"
- echo "$Id: WinPopup.in,v 1.6 2006/03/09 12:55:10 xunsun Exp $"
+ echo "$Id: WinPopup.in,v 1.7 2006/03/10 04:14:20 xunsun Exp $"
}
meta_data() {
@@ -120,7 +120,7 @@
ocf_log warn "Don't stat/monitor me! WinPopup is a pseudo resource
agent, so the status reported may be incorrect"
if [ -f $WINPOPUPFILE ]; then
echo "running"
- return_master $OCF_SUCCESS
+ return $OCF_SUCCESS
else
echo "stopped"
return $OCF_NOT_RUNNING
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Xinetd.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Xinetd.in 9 Mar 2006 12:55:10 -0000 1.9
+++ Xinetd.in 10 Mar 2006 04:14:20 -0000 1.10
@@ -138,7 +138,7 @@
xup_status () {
if [ -f $PIDFILE ]; then
echo running
- return_master $OCF_SUCCESS
+ return $OCF_SUCCESS
else
echo stopped
return $OCF_NOT_RUNNING
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/apache.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- apache.in 9 Mar 2006 12:55:10 -0000 1.15
+++ apache.in 10 Mar 2006 04:14:20 -0000 1.16
@@ -316,7 +316,7 @@
ocf_log info "$CMD already running (pid $ApachePID)"
return $OCF_SUCCESS
fi
- run $HTTPD $HTTPDOPTS -f $CONFIGFILE
+ ocf_run $HTTPD $HTTPDOPTS -f $CONFIGFILE
}
stop_apache() {
@@ -375,8 +375,7 @@
if
silent_status
then
- run sh -c "$WGET $WGETOPTS $STATUSURL | grep -i '</ *body *></ *html *>'
>/dev/null"
- return_master $?
+ ocf_run sh -c "$WGET $WGETOPTS $STATUSURL | grep -i '</ *body *></ *html
*>' >/dev/null"
else
ocf_log info "$CMD not running"
return $OCF_NOT_RUNNING
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/db2.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- db2.in 9 Mar 2006 12:55:10 -0000 1.9
+++ db2.in 10 Mar 2006 04:14:20 -0000 1.10
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: db2.in,v 1.9 2006/03/09 12:55:10 xunsun Exp $
+# $Id: db2.in,v 1.10 2006/03/10 04:14:20 xunsun Exp $
#
# db2
#
@@ -48,7 +48,7 @@
The 'validate-all' operation reports whether the parameters are valid
The 'methods' operation reports on the methods $0 supports
- $Id: db2.in,v 1.9 2006/03/09 12:55:10 xunsun Exp $
+ $Id: db2.in,v 1.10 2006/03/10 04:14:20 xunsun Exp $
!
}
@@ -279,11 +279,11 @@
else
ocf_log err "DB2 UDB instance $1 DB $DB is not working"
ocf_log err "DB2 UDB message: $output"
- return `return_master $OCF_ERR_GENERIC`
+ return $OCF_ERR_GENERIC
fi
done
ocf_log info "All DBs in DB2 UDB instance $1 appear to be working"
- return_master $OCF_SUCCESS
+ return $OCF_SUCCESS
}
#
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/drbd.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- drbd.in 9 Mar 2006 12:55:10 -0000 1.19
+++ drbd.in 10 Mar 2006 04:14:20 -0000 1.20
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: drbd.in,v 1.19 2006/03/09 12:55:10 xunsun Exp $
+# $Id: drbd.in,v 1.20 2006/03/10 04:14:20 xunsun Exp $
#
# OCF Resource Agent compliant drbd resource script.
#
@@ -317,16 +317,16 @@
if [ "$DRBD_STATE_LOCAL" != "Secondary" ] \
&& [ "$DRBD_STATE_LOCAL" != "Primary" ]; then
ocf_log err "$RESOURCE monitor: unexpected local state:
$DRBD_STATE_LOCAL"
- return `return_master $OCF_ERR_GENERIC`
+ return $OCF_ERR_GENERIC
fi
ROLE="$OCF_RESKEY_role"
if [ -n "$ROLE" ] && [ "$DRBD_STATE_LOCAL" != "$ROLE" ]; then
ocf_log err "$RESOURCE monitor: wrong state: expected $ROLE !=
$DRBD_STATE_LOCAL"
- return `return_master $OCF_ERR_GENERIC`
+ return $OCF_ERR_GENERIC
fi
- return_master $OCF_SUCCESS
+ return $OCF_SUCCESS
}
drbd_promote() {
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ocf-shellfuncs.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ocf-shellfuncs.in 9 Mar 2006 12:55:10 -0000 1.25
+++ ocf-shellfuncs.in 10 Mar 2006 04:14:20 -0000 1.26
@@ -1,5 +1,5 @@
#
-# $Id: ocf-shellfuncs.in,v 1.25 2006/03/09 12:55:10 xunsun Exp $
+# $Id: ocf-shellfuncs.in,v 1.26 2006/03/10 04:14:20 xunsun Exp $
#
# Common helper functions for the OCF Resource Agents supplied by
# heartbeat.
@@ -229,9 +229,9 @@
#
# Run: Run a script, and log its output.
-# Usage: run <command>
+# Usage: ocf_run <command>
#
-run() {
+ocf_run() {
output=`"$@" 2>&1`
rc=$?
output=`echo $output`
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/portblock.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- portblock.in 9 Mar 2006 12:55:10 -0000 1.6
+++ portblock.in 10 Mar 2006 04:14:20 -0000 1.7
@@ -201,7 +201,7 @@
esac
fi
- return_master $?
+ return $?
}
#IptablesBLOCK {udp|tcp} portno,portno
------------------------------
_______________________________________________
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 17
********************************************
