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: linux-ha by alan from
([email protected])
2. Linux-HA CVS: linux-ha by alan from
([email protected])
3. Linux-HA CVS: cim by lars from ([email protected])
4. Linux-HA CVS: linux-ha by sunjd from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 21 Dec 2005 13:31:04 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in
Log Message:
Put in code to condititionally include the mgmt daemon in the RPM spec file
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -3 -r1.151 -r1.152
--- heartbeat.spec.in 25 Oct 2005 19:16:58 -0000 1.151
+++ heartbeat.spec.in 21 Dec 2005 20:31:04 -0000 1.152
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.151 2005/10/25 19:16:58 gshi Exp $
+# $Id: heartbeat.spec.in,v 1.152 2005/12/21 20:31:04 alan Exp $
# Workaround for a change in RPM 4.1.x; needs proper fixing soon!
##%define _unpackaged_files_terminate_build 0
@@ -1040,6 +1040,8 @@
%doc @mandir@/man1/ha_logger.1*
%doc @mandir@/man1/hb_standby.1*
%doc @mandir@/man1/hb_takeover.1*
+%doc @mandir@/man1/hb_addnode.1*
+%doc @mandir@/man1/hb_delnode.1*
%doc @mandir@/man8/heartbeat.8*
%doc @mandir@/man8/apphbd.8*
%doc @mandir@/man8/ha_logd.8*
@@ -1048,6 +1050,13 @@
%if %{ENABLE_SNMP_SUBAGENT}
@MIBS_DIR@/LINUX-HA-MIB.mib
%endif
+%define ENABLE_MGMT @MGMT_ENABLED@
+%if %{ENABLE_MGMT}
+ @libdir@/libmgmt.*
+ @libdir@/libmgmtclient.*
+ @libdir@/libmgmtcommon.*
+ @libdir@/libmgmttls.*
+%endif
###########################################################
# Files for ldirectord
------------------------------
Message: 2
Date: Wed, 21 Dec 2005 13:41:47 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in
Log Message:
Added a couple of other management daemon files I'd missed before.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -3 -r1.152 -r1.153
--- heartbeat.spec.in 21 Dec 2005 20:31:04 -0000 1.152
+++ heartbeat.spec.in 21 Dec 2005 20:41:47 -0000 1.153
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.152 2005/12/21 20:31:04 alan Exp $
+# $Id: heartbeat.spec.in,v 1.153 2005/12/21 20:41:47 alan Exp $
# Workaround for a change in RPM 4.1.x; needs proper fixing soon!
##%define _unpackaged_files_terminate_build 0
@@ -1056,6 +1056,8 @@
@libdir@/libmgmtclient.*
@libdir@/libmgmtcommon.*
@libdir@/libmgmttls.*
+ /etc/pam.d/mgmtd
+ /usr/share/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
%endif
###########################################################
------------------------------
Message: 3
Date: Wed, 21 Dec 2005 14:18:06 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim
Modified Files:
Makefile.am
Log Message:
simpledemo doesn't build. Commenting it out. Please fix.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 21 Dec 2005 10:51:29 -0000 1.13
+++ Makefile.am 21 Dec 2005 21:18:06 -0000 1.14
@@ -132,7 +132,7 @@
libHA_OperationOnProvider_la_SOURCES = assoc_utils.c
operation_on_provider.c
libHA_OperationOnProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-noinst_PROGRAMS = simpledemo
-simpledemo_SOURCES = simple_demo.c
-simpledemo_LDADD = libHAClusterInfo.la
+#noinst_PROGRAMS = simpledemo
+#simpledemo_SOURCES = simple_demo.c
+#simpledemo_LDADD = libHAClusterInfo.la
------------------------------
Message: 4
Date: Wed, 21 Dec 2005 17:28:53 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
let configure do more check for building management module
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -3 -r1.480 -r1.481
--- configure.in 20 Dec 2005 18:08:24 -0000 1.480
+++ configure.in 22 Dec 2005 00:28:53 -0000 1.481
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.480 $) dnl cvs revision
+AC_REVISION($Revision: 1.481 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -2253,23 +2253,48 @@
dnl management tool configuration
AC_ARG_ENABLE([mgmt],
-[ --enable-mgmt Compile the management tool. [default=no]],
- [], [enable_mgmt=no])
+[ --enable-mgmt Compile the management tool. [default=try]],
+ [], [enable_mgmt=try])
MGMT_ENABLED=0
-if test "x${enable_mgmt}" = "xyes"; then
+if test "x${enable_mgmt}" = "xyes" | test "x${enable_mgmt}" = "xtry"; then
MGMT_ENABLED=1
- python_headers_found="yes"
+ python_headers_found="yes"
PYTHON_HEADER_DIR="python${PYTHON_VERSION}"
AC_CHECK_HEADER($PYTHON_HEADER_DIR/Python.h, ,
[python_headers_found="no"],)
+ pam_headers_found="yes"
+ AC_CHECK_HEADER(security/pam_appl.h, , [pam_headers_found="no"],)
fi
if test x${python_headers_found} != "xyes"; then
+ if test "x${enable_mgmt}" = "xyes"; then
+ FatalMissingThing "Python.h" "You need python-devel package for
" \
+ "building the GUI managment module"
+ elif test "x${enable_mgmt}" = "xtry"; then
+ AC_MSG_WARN([Donnot find Python.h, so disable the building of
the GUI
+ managment module. You need python-devel package for
+ building the GUI managment module.])
+ enable_mgmt=no
+ MGMT_ENABLED=0
+ fi
PYTHON_HEADER_DIR=
fi
AC_SUBST(PYTHON_HEADER_DIR)
+if test x${pam_headers_found} != "xyes"; then
+ if test "x${enable_mgmt}" = "xyes"; then
+ FatalMissingThing "pam_appl.h" "You need pam-devel package for
" \
+ "building the GUI managment module"
+ elif test "x${enable_mgmt}" = "xtry"; then
+ AC_MSG_WARN([Donnot find pam_appl.h, so disable the building of
the GUI
+ managment module. You need pam-devel package for
+ building the GUI managment module.])
+ enable_mgmt=no
+ MGMT_ENABLED=0
+ fi
+fi
+
AC_SUBST(MGMT_ENABLED)
-AM_CONDITIONAL(MGMT_BUILD, test "x${enable_mgmt}" = "xyes")
+AM_CONDITIONAL(MGMT_BUILD, test "x${enable_mgmt}" != "xno")
echo "$as_me:$LINENO: Enabling the management tool ... ${enable_mgmt}" >&5
echo $ECHO_N "Enabling the management tool ... ${enable_mgmt}" >&6
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 59
********************************************
