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 xunsun from
([email protected])
2. Linux-HA CVS: debian by horms from
([email protected])
3. Linux-HA CVS: resources by xunsun from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 11 Feb 2006 01:04:43 -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/heartbeat
Modified Files:
hto-mapfuncs.in
Log Message:
fix the parsing when envar is of the form \'options=data=journal\'
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/heartbeat/hto-mapfuncs.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- hto-mapfuncs.in 19 Jan 2006 23:17:26 -0000 1.15
+++ hto-mapfuncs.in 11 Feb 2006 08:04:38 -0000 1.16
@@ -140,7 +140,7 @@
setup_OCF_prefix(){
hbvarname=`echo "$envar" | cut -d${PARAMETER_SPLIT_SIGN} -f1`
- hbvarvalue=`echo "$envar" | cut -d${PARAMETER_SPLIT_SIGN} -f2`
+ hbvarvalue=`echo "$envar" | cut -d${PARAMETER_SPLIT_SIGN} -f2-`
ocfvarname="OCF_RESKEY_${hbvarname}"
eval $ocfvarname='$hbvarvalue'
------------------------------
Message: 2
Date: Sat, 11 Feb 2006 04:21:31 -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 control heartbeat-2-dev.files heartbeat-2.files
rules
Log Message:
Debian Packaging
Add management tool!
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- changelog 10 Feb 2006 03:45:52 -0000 1.57
+++ changelog 11 Feb 2006 11:21:30 -0000 1.58
@@ -34,8 +34,11 @@
(closes: #339016)
* Add Pre-Depends on adduser
(closes: #352158)
+ * Add management tool
+ ./confgure --enable-mgmt
+ Build-Depends: python2.3-dev, libpam0g-dev
- -- Simon Horman <[EMAIL PROTECTED]> Fri, 10 Feb 2006 12:19:56 +0900
+ -- Simon Horman <[EMAIL PROTECTED]> Sat, 11 Feb 2006 09:41:17 +0000
heartbeat-2 (2.0.2-5) unstable; urgency=low
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/control,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- control 10 Feb 2006 03:45:52 -0000 1.40
+++ control 11 Feb 2006 11:21:30 -0000 1.41
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Simon Horman <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libsnmp9-dev, libglib2.0-dev, perl,
net-tools, netkit-ping | iputils-ping, python, psmisc, modutils, libnet1-dev,
iproute, libtool, automake1.9 | automaken, libcurl3-openssl-dev, libxml2-dev,
bison, flex, uuid-dev, libopenipmi-dev (>= 2.0.1), lynx, libbz2-dev,
zlib1g-dev, uuid-dev, libsensors-dev, libltdl3-dev, swig, openssh-client,
libgnutls11-dev
+Build-Depends: debhelper (>= 4.0.0), libsnmp9-dev, libglib2.0-dev, perl,
net-tools, netkit-ping | iputils-ping, python, psmisc, modutils, libnet1-dev,
iproute, libtool, automake1.9 | automaken, libcurl3-openssl-dev, libxml2-dev,
bison, flex, uuid-dev, libopenipmi-dev (>= 2.0.1), lynx, libbz2-dev,
zlib1g-dev, uuid-dev, libsensors-dev, libltdl3-dev, swig, openssh-client,
libgnutls11-dev, python2.3-dev, libpam0g-dev
Build-Conflicts: automake1.4
Standards-Version: 3.6.2
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2-dev.files,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- heartbeat-2-dev.files 3 Feb 2006 01:15:16 -0000 1.4
+++ heartbeat-2-dev.files 11 Feb 2006 11:21:30 -0000 1.5
@@ -8,6 +8,7 @@
usr/include/clplumbing/cl_pidfile.h
usr/include/clplumbing/cl_plugin.h
usr/include/clplumbing/cl_poll.h
+usr/include/clplumbing/cl_random.h
usr/include/clplumbing/cl_signal.h
usr/include/clplumbing/cl_syslog.h
usr/include/clplumbing/cl_tiebreaker.h
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.files,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- heartbeat-2.files 3 Feb 2006 01:15:16 -0000 1.9
+++ heartbeat-2.files 11 Feb 2006 11:21:30 -0000 1.10
@@ -1,4 +1,3 @@
-
/etc/ha.d/README.config
/etc/ha.d/harc
/etc/ha.d/rc.d/ask_resources
@@ -29,6 +28,7 @@
/etc/ha.d/resource.d/portblock
/etc/ha.d/shellfuncs
/etc/heartbeat
+/etc/pam.d/hbmgmtd
etc/init.d/heartbeat
etc/logrotate.d/heartbeat
usr/bin/cl_respawn
@@ -37,6 +37,9 @@
usr/lib/heartbeat/ResourceManager
usr/lib/heartbeat/SNMPAgentSanityCheck
usr/lib/heartbeat/TestHeartbeatComm
+usr/lib/heartbeat/_pymgmt.so
+usr/lib/heartbeat/_pymgmt.so.0
+usr/lib/heartbeat/_pymgmt.so.0.0.0
usr/lib/heartbeat/api_test
usr/lib/heartbeat/apphbd
usr/lib/heartbeat/apphbtest
@@ -72,9 +75,12 @@
usr/lib/heartbeat/cts/OCFIPraTest.py
usr/lib/heartbeat/cts/extracttests.py
usr/lib/heartbeat/findif
+usr/lib/heartbeat/ha.png
usr/lib/heartbeat/ha_config
usr/lib/heartbeat/ha_logd
usr/lib/heartbeat/ha_logger
+usr/lib/heartbeat/haclient.glade
+usr/lib/heartbeat/haclient.py
usr/lib/heartbeat/haresources2cib.py
usr/lib/heartbeat/hb_addnode
usr/lib/heartbeat/hb_delnode
@@ -91,6 +97,9 @@
usr/lib/heartbeat/lrmd
usr/lib/heartbeat/lrmtest/LRMBasicSanityCheck
usr/lib/heartbeat/mach_down
+usr/lib/heartbeat/mgmtcmd.py
+usr/lib/heartbeat/mgmtd
+usr/lib/heartbeat/mgmtdtest
usr/lib/heartbeat/mlock
usr/lib/heartbeat/ocf-shellfuncs
usr/lib/heartbeat/pengine
@@ -114,6 +123,7 @@
usr/lib/heartbeat/plugins/test/test.so
usr/lib/heartbeat/plugins/tiebreaker/twonodes.so
usr/lib/heartbeat/ptest
+usr/lib/heartbeat/pymgmt.py
usr/lib/heartbeat/recoverymgrd
usr/lib/heartbeat/req_resource
usr/lib/heartbeat/send_arp
@@ -134,6 +144,18 @@
usr/lib/libcrmcommon.so.1.0.0
usr/lib/libhbclient.so.1
usr/lib/libhbclient.so.1.0.0
+usr/lib/libhbmgmt.so
+usr/lib/libhbmgmt.so.0
+usr/lib/libhbmgmt.so.0.0.0
+usr/lib/libhbmgmtclient.so
+usr/lib/libhbmgmtclient.so.0
+usr/lib/libhbmgmtclient.so.0.0.0
+usr/lib/libhbmgmtcommon.so
+usr/lib/libhbmgmtcommon.so.0
+usr/lib/libhbmgmtcommon.so.0.0.0
+usr/lib/libhbmgmttls.so
+usr/lib/libhbmgmttls.so.0
+usr/lib/libhbmgmttls.so.0.0.0
usr/lib/liblrm.so.0
usr/lib/liblrm.so.0.0.0
usr/lib/libpengine.so.1
@@ -230,6 +252,7 @@
usr/share/doc/heartbeat-2/rsync.html
usr/share/doc/heartbeat-2/rsync.txt
usr/share/doc/heartbeat-2/startstop
+usr/share/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
usr/share/man/man1/cl_status.1.gz
usr/share/man/man1/ha_logger.1.gz
usr/share/man/man1/hb_addnode.1.gz
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/rules,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- rules 3 Feb 2006 01:15:16 -0000 1.36
+++ rules 11 Feb 2006 11:21:30 -0000 1.37
@@ -25,7 +25,7 @@
--mandir=/usr/share/man \
--with-group-name=haclient --with-ccmuser-name=hacluster \
--enable-snmp-subagent --with-mibsdir=/usr/share/snmp/mibs \
- --disable-fatal-warnings
+ --disable-fatal-warnings --enable-mgmt
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
------------------------------
Message: 3
Date: Sat, 11 Feb 2006 06:03:40 -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/heartbeat
Modified Files:
hto-mapfuncs.in
Log Message:
code formatting
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/heartbeat/hto-mapfuncs.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- hto-mapfuncs.in 11 Feb 2006 08:04:38 -0000 1.16
+++ hto-mapfuncs.in 11 Feb 2006 13:03:40 -0000 1.17
@@ -58,30 +58,30 @@
;;
$OCF_ERR_GENERIC)
- log_and_print "ERROR: " $rsc_type Generic error
+ log_and_print "ERROR: $rsc_type Generic error"
;;
$OCF_ERR_ARGS)
- log_and_print "ERROR: " $rsc_type Incompliant argument
+ log_and_print "ERROR: $rsc_type Incompliant argument"
;;
$OCF_ERR_UNIMPLEMENTED)
- log_and_print "ERROR: " $rsc_type Function unimplemented
+ log_and_print "ERROR: $rsc_type Function unimplemented"
;;
$OCF_ERR_PERM)
- log_and_print "ERROR: " $rsc_type User had insufficient
privilege
+ log_and_print "ERROR: $rsc_type User had insufficient privilege"
;;
$OCF_ERR_INSTALLED)
- log_and_print "ERROR: " $rsc_type Program is not installed
+ log_and_print "ERROR: $rsc_type Program is not installed"
;;
$OCF_ERR_CONFIGURED)
- log_and_print "ERROR: " $rsc_type Program is not configured
+ log_and_print "ERROR: $rsc_type Program is not configured"
;;
$OCF_NOT_RUNNING)
- log_and_print "INFO: " $rsc_type Resource is stopped
+ log_and_print "INFO: $rsc_type Resource is stopped"
;;
*)
echo $?
- log_and_print "ERROR: " $rsc_type Unknown error
+ log_and_print "ERROR: $rsc_type Unknown error"
exit 1
;;
esac
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 49
********************************************
