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: mgmt by zhenh from
([email protected])
2. Linux-HA CVS: mgmt by zhenh from
([email protected])
3. Linux-HA CVS: mgmt by zhenh from
([email protected])
4. Linux-HA CVS: linux-ha by panjiam from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 10 Apr 2006 23:29:34 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c
Log Message:
rename the attribute to avoid confliction
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- mgmt_crm.c 10 Apr 2006 06:23:36 -0000 1.25
+++ mgmt_crm.c 11 Apr 2006 05:29:34 -0000 1.26
@@ -723,21 +723,22 @@
if (clone) {
snprintf(buf, MAX_STRLEN,
"<clone id=\"%s\"><instance_attributes><attributes>" \
- "<nvpair id=\"clone_max\" name=\"clone_max\"
value=\"%s\"/>" \
- "<nvpair id=\"clone_node_max\" name=\"clone_node_max\"
value=\"%s\"/>" \
+ "<nvpair id=\"%s_clone_max\" name=\"clone_max\"
value=\"%s\"/>" \
+ "<nvpair id=\"%s_clone_node_max\"
name=\"clone_node_max\" value=\"%s\"/>" \
"</attributes> </instance_attributes> ",
- argv[7], argv[8], argv[9]);
+ argv[7], argv[7], argv[8],argv[7], argv[9]);
strncat(xml, buf, MAX_STRLEN);
}
if (master) {
snprintf(buf, MAX_STRLEN,
"<master_slave
id=\"%s\"><instance_attributes><attributes>" \
- "<nvpair id=\"clone_max\" name=\"clone_max\"
value=\"%s\"/>" \
- "<nvpair id=\"clone_node_max\" name=\"clone_node_max\"
value=\"%s\"/>" \
- "<nvpair id=\"master_max\" name=\"master_max\"
value=\"%s\"/>" \
- "<nvpair id=\"master_node_max\"
name=\"master_node_max\" value=\"%s\"/>" \
+ "<nvpair id=\"%s_clone_max\" name=\"clone_max\"
value=\"%s\"/>" \
+ "<nvpair id=\"%s_clone_node_max\"
name=\"clone_node_max\" value=\"%s\"/>" \
+ "<nvpair id=\"%s_master_max\" name=\"master_max\"
value=\"%s\"/>" \
+ "<nvpair id=\"%s_master_node_max\"
name=\"master_node_max\" value=\"%s\"/>" \
"</attributes> </instance_attributes>",
- argv[7], argv[8], argv[9], argv[10], argv[11]);
+ argv[7], argv[7], argv[8], argv[7], argv[9],
+ argv[7], argv[10], argv[7], argv[11]);
strncat(xml, buf, MAX_STRLEN);
}
@@ -1203,10 +1204,10 @@
ARGC_CHECK(4);
snprintf(xml,MAX_STRLEN,
"<clone id=\"%s\"><instance_attributes><attributes>" \
- "<nvpair id=\"clone_max\" name=\"clone_max\" value=\"%s\"/>" \
- "<nvpair id=\"clone_node_max\" name=\"clone_node_max\"
value=\"%s\"/>" \
+ "<nvpair id=\"%s_clone_max\" name=\"clone_max\"
value=\"%s\"/>" \
+ "<nvpair id=\"%s_clone_node_max\" name=\"clone_node_max\"
value=\"%s\"/>" \
"</attributes></instance_attributes></clone>",
- argv[1],argv[2],argv[3]);
+ argv[1],argv[1],argv[2],argv[1],argv[3]);
cib_object = string2xml(xml);
if(cib_object == NULL) {
@@ -1273,12 +1274,12 @@
ARGC_CHECK(6);
snprintf(xml,MAX_STRLEN,
"<master_slave id=\"%s\"><instance_attributes><attributes>" \
- "<nvpair id=\"clone_max\" name=\"clone_max\" value=\"%s\"/>" \
- "<nvpair id=\"clone_node_max\" name=\"clone_node_max\"
value=\"%s\"/>" \
- "<nvpair id=\"master_max\" name=\"master_max\" value=\"%s\"/>"
\
- "<nvpair id=\"master_node_max\" name=\"master_node_max\"
value=\"%s\"/>" \
+ "<nvpair id=\"%s_clone_max\" name=\"clone_max\"
value=\"%s\"/>" \
+ "<nvpair id=\"%s_clone_node_max\" name=\"clone_node_max\"
value=\"%s\"/>" \
+ "<nvpair id=\"%s_master_max\" name=\"master_max\"
value=\"%s\"/>" \
+ "<nvpair id=\"%s_master_node_max\" name=\"master_node_max\"
value=\"%s\"/>" \
"</attributes></instance_attributes></master_slave>",
- argv[1],argv[2],argv[3],argv[4],argv[5]);
+
argv[1],argv[1],argv[2],argv[1],argv[3],argv[1],argv[4],argv[1],argv[5]);
cib_object = string2xml(xml);
if(cib_object == NULL) {
------------------------------
Message: 2
Date: Mon, 10 Apr 2006 23:53:49 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
haclient.py.in
Log Message:
change the icon of 'not running' to stopped icon
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- haclient.py.in 11 Apr 2006 02:54:12 -0000 1.25
+++ haclient.py.in 11 Apr 2006 05:53:49 -0000 1.26
@@ -360,7 +360,9 @@
status = model.get_value(iter, 1)
iter_status = 0
if type == _("native") :
- if string.find(status, _("running")) != -1 :
+ if string.find(status, _("not running")) != -1 :
+ iter_status = 1
+ elif string.find(status, _("running")) != -1 :
iter_status = 0
elif string.find(status, _("fail")) != -1 :
iter_status = 3
------------------------------
Message: 3
Date: Tue, 11 Apr 2006 01:17:51 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/client
Modified Files:
haclient.zh_CN.po
Log Message:
add more strings
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.zh_CN.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- haclient.zh_CN.po 7 Apr 2006 08:36:20 -0000 1.2
+++ haclient.zh_CN.po 11 Apr 2006 07:17:48 -0000 1.3
@@ -567,3 +567,33 @@
msgid "Make"
msgstr "让"
+msgid "not running"
+msgstr "æªè¿è¡"
+
+msgid "Start"
+msgstr "å¯å¨"
+
+msgid "Stop"
+msgstr "åæ¢"
+
+msgid "stop resource"
+msgstr "åæ¢èµæº"
+
+msgid "start resource"
+msgstr "å¯å¨èµæº"
+
+msgid "Not Connected"
+msgstr "æªè¿æ¥"
+
+msgid "Connected to "
+msgstr "å·²è¿æ¥"
+
+msgid "Updating data from server..."
+msgstr "æ£å¨ä»æå¡å¨æ´æ°æ°æ®..."
+
+msgid "Can't connect to server"
+msgstr "è¿æ¥æå¡å¨å¤±è´¥"
+
+msgid "Failed in the authentication.\n User Name or Password may be wrong.\n
or the user doesn't belong to haclient group"
+msgstr
"ç¨æ·è®¤è¯å¤±è´¥ï¼å¯è½æ¯ç¨æ·æå¯ç ä¸å¯¹ï¼æ该ç¨æ·ä¸å±äºhaclientç»"
+
------------------------------
Message: 4
Date: Tue, 11 Apr 2006 01:20:47 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
cmpi providers will be installed to the path specified in the openwbem
config file if --with-provider-dir does not present.
if config not found, then install to the path with the same prefix as
the cimom's binary (/usr or /usr/local).
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -3 -r1.502 -r1.503
--- configure.in 10 Apr 2006 14:54:46 -0000 1.502
+++ configure.in 11 Apr 2006 07:20:47 -0000 1.503
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.502 $) dnl cvs revision
+AC_REVISION($Revision: 1.503 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -1127,8 +1127,26 @@
if test "x${CMPI_PROVIDER_DIR}" = "x"; then
case ${CIMOM} in
- sfcbd) CMPI_PROVIDER_DIR=${libdir}/cmpi;;
-
openwbem)CMPI_PROVIDER_DIR=${libdir}/openwbem/cmpiproviders;;
+ sfcbd) SFCBD_PREFIX=`which sfcbd`
+ SFCBD_PREFIX=`dirname ${SFCBD_PREFIX}`
+ SFCBD_PREFIX=`dirname ${SFCBD_PREFIX}`
+ CMPI_PROVIDER_DIR=${SFCBD_PREFIX}/lib/cmpi;;
+ openwbem)
+ OPENWBEM_PREFIX=`which owcimomd`
+ OPENWBEM_PREFIX=`dirname ${OPENWBEM_PREFIX}`
+ OPENWBEM_PREFIX=`dirname ${OPENWBEM_PREFIX}`
+
OPENWBEM_CONFIG=${OPENWBEM_PREFIX}/etc/openwbem/openwbem.conf
+ OPENWBEM_CMPI_DIR=`grep -e
"cmpiprovifc.prov_location.*=" \
+ ${OPENWBEM_CONFIG} | sed -e
's/.*=\s*\(\.*\)/\1/'`
+ if test "x${OPENWBEM_CMPI_DIR}" != "x"; then
+ CMPI_PROVIDER_DIR=${OPENWBEM_CMPI_DIR}
+ echo cmpi provider dir set, using
openwbem config file: \
+ ${OPENWBEM_CONFIG}.
+ else
+
CMPI_PROVIDER_DIR=${OPENWBEM_PREFIX}/lib/openwbem/cmpiproviders
+ echo openwbem config not found, cmpi
provider dir set to \
+ $(CMPI_PROVIDER_DIR) by
default.
+ fi;;
pegasus)
CMPI_PROVIDER_DIR=/opt/tog-pegasus/providers/lib;;
*);;
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 29, Issue 71
********************************************
