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: heartbeat by alan from 
      ([email protected])


----------------------------------------------------------------------

Message: 1
Date: Sat, 29 Apr 2006 07:12:20 -0600 (MDT)
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:
        configure.in 


Log Message:

Patch to allow the management daemon to not be started
automatically if it's not been compiled in.
This patch due to Keisuke MORI <[EMAIL PROTECTED]>

===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -3 -r1.509 -r1.510
--- configure.in        28 Apr 2006 19:01:36 -0000      1.509
+++ configure.in        29 Apr 2006 13:12:20 -0000      1.510
@@ -10,7 +10,7 @@
 AC_INIT(heartbeat.spec.in)
 
 AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.509 $) dnl cvs revision
+AC_REVISION($Revision: 1.510 $) dnl cvs revision
 AC_CANONICAL_HOST
 
 
@@ -2318,7 +2318,10 @@
 
 AC_SUBST(MGMT_ENABLED)
 AM_CONDITIONAL(MGMT_BUILD, test "x${enable_mgmt}" != "xno")
-
+if test "x${enable_mgmt}" != "xno"; then
+     AC_DEFINE_UNQUOTED(MGMT_ENABLED, 1, Define to 1 if the mgmt is enabled.)
+fi
+   
 AC_MSG_NOTICE([whether to enable the management tool... ${enable_mgmt}])
 
 hb_libdir="${libdir}/${HB_PKG}"




------------------------------

Message: 2
Date: Sat, 29 Apr 2006 07:12:22 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by alan from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : alan
Host    : 
Project : linux-ha
Module  : heartbeat

Dir     : linux-ha/heartbeat


Modified Files:
        config.c 


Log Message:

Patch to allow the management daemon to not be started
automatically if it's not been compiled in.
This patch due to Keisuke MORI <[EMAIL PROTECTED]>

===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/config.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -3 -r1.199 -r1.200
--- config.c    26 Apr 2006 03:42:07 -0000      1.199
+++ config.c    29 Apr 2006 13:12:20 -0000      1.200
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.199 2006/04/26 03:42:07 alan Exp $ */
+/* $Id: config.c,v 1.200 2006/04/29 13:12:20 alan Exp $ */
 /*
  * Parse various heartbeat configuration files...
  *
@@ -2451,7 +2451,9 @@
        ,       {"apiauth", "stonithd   uid=root" }
        ,       {"apiauth", "attrd      uid=" HA_CCMUSER}
        ,       {"apiauth", "crmd       uid=" HA_CCMUSER}
+#ifdef MGMT_ENABLED
        ,       {"apiauth", "mgmtd      uid=root" }
+#endif
        ,       {"apiauth", "pingd      uid=" HA_CCMUSER}
 
        ,       {"respawn", " "HA_CCMUSER " " HALIB "/ccm"}
@@ -2460,7 +2462,9 @@
        ,       {"respawn", "root "           HALIB "/stonithd"}
        ,       {"respawn", " "HA_CCMUSER " " HALIB "/attrd"}
        ,       {"respawn", " "HA_CCMUSER " " HALIB "/crmd"}
+#ifdef MGMT_ENABLED
        ,       {"respawn", "root "           HALIB "/mgmtd -v"}
+#endif
                /* Don't 'respawn' pingd - it's a resource agent */
        };
        gboolean        dorel2;
@@ -2573,6 +2577,12 @@
 
 /*
  * $Log: config.c,v $
+ * Revision 1.200  2006/04/29 13:12:20  alan
+ *
+ * Patch to allow the management daemon to not be started
+ * automatically if it's not been compiled in.
+ * This patch due to Keisuke MORI <[EMAIL PROTECTED]>
+ *
  * Revision 1.199  2006/04/26 03:42:07  alan
  * Committed a patch from gshi which should GREATLY improve the
  * behavior of autojoin code.




------------------------------

_______________________________________________
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 147
*********************************************

Reply via email to