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: crm by lars from ([email protected])
2. Linux-HA CVS: linux-ha by davidlee from
([email protected])
3. Linux-HA CVS: linux-ha by zhenh from
([email protected])
4. Linux-HA CVS: debian by zhenh from
([email protected])
5. Linux-HA CVS: resources by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 25 May 2006 12:18:40 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/admin
Modified Files:
crm_mon.c
Log Message:
Off by three orders of magnitude ;-)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_mon.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- crm_mon.c 24 May 2006 08:27:19 -0000 1.24
+++ crm_mon.c 25 May 2006 18:18:39 -0000 1.25
@@ -1,4 +1,4 @@
-/* $Id: crm_mon.c,v 1.24 2006/05/24 08:27:19 andrew Exp $ */
+/* $Id: crm_mon.c,v 1.25 2006/05/25 18:18:39 lars Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -63,7 +63,7 @@
void blank_screen(void);
int print_status(crm_data_t *cib);
/* #define printw_at(line, fmt...) move(line, 0); printw(fmt); line++ */
-void wait_for_refresh(int offset, const char *prefix, int seconds);
+void wait_for_refresh(int offset, const char *prefix, int msec);
int print_html_status(crm_data_t *cib, const char *filename);
void make_daemon(gboolean daemonize, const char *pidfile);
gboolean mon_timer_popped(gpointer data);
@@ -74,7 +74,7 @@
gboolean as_console = FALSE;
gboolean group_by_node = FALSE;
gboolean inactive_resources = FALSE;
-int interval = 15;
+int interval = 15000;
gboolean daemonize = FALSE;
GMainLoop* mainloop = NULL;
guint timer_id = 0;
@@ -337,12 +337,12 @@
}
void
-wait_for_refresh(int offset, const char *prefix, int seconds)
+wait_for_refresh(int offset, const char *prefix, int msec)
{
- int lpc = seconds;
+ int lpc = msec / 1000;
if(as_console == FALSE) {
- timer_id = Gmain_timeout_add(seconds*1000, mon_timer_popped,
NULL);
+ timer_id = Gmain_timeout_add(msec, mon_timer_popped, NULL);
return;
}
------------------------------
Message: 2
Date: Thu, 25 May 2006 14:18:15 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
bootstrap
Log Message:
Stricter Bourne-shell compliance
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/bootstrap,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- bootstrap 3 May 2006 07:54:38 -0000 1.27
+++ bootstrap 25 May 2006 20:18:14 -0000 1.28
@@ -40,11 +40,12 @@
#
# The ERR trap is not executed if the failed command is part
# of an until or while loop, part of an if statement, part of a &&
- # or || list, or if the command's return value is being inverted
- # via !.
+ # or || list.
if
- ! which $WHICH_OPTS $cmd </dev/null >/dev/null 2>&1
+ which $WHICH_OPTS $cmd </dev/null >/dev/null 2>&1
then
+ :
+ else
return 1
fi
------------------------------
Message: 3
Date: Thu, 25 May 2006 19:30:51 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
1.fix the libdir for 64bits. 2.add VIPArip (Virtual IP Address by rip2)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -3 -r1.522 -r1.523
--- configure.in 24 May 2006 06:48:24 -0000 1.522
+++ configure.in 26 May 2006 01:30:50 -0000 1.523
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.522 $) dnl cvs revision
+AC_REVISION($Revision: 1.523 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -209,15 +209,11 @@
mandir=`var "$mandir" "$exec_prefix/man"`
docdir=${datadir}/doc/${HB_PKG}-${VERSION}
-if test x"$libdir" = x; then
- libdir="$exec_prefix/lib"
- if needs_64_bit_libs; then
- old=$libdir
- libdir=$exec_prefix/lib64
- AC_MSG_WARN(overriding libdir from $old to $libdir)
- fi
-else
- libdir=`eval echo "$libdir"`
+libdir="$exec_prefix/lib"
+if needs_64_bit_libs; then
+ old=$libdir
+ libdir=$exec_prefix/lib64
+ AC_MSG_WARN(overriding libdir from $old to $libdir)
fi
if test x"$libexecdir" = x; then
@@ -2748,6 +2744,7 @@
resources/OCF/portblock \
resources/OCF/Raid1 \
resources/OCF/ServeRAID \
+ resources/OCF/VIPArip \
resources/OCF/WAS \
resources/OCF/WinPopup \
resources/OCF/Xen \
------------------------------
Message: 4
Date: Thu, 25 May 2006 19:32:14 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
heartbeat-2.files
Log Message:
add VIPArip (Virtual IP Address by rip2)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.files,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- heartbeat-2.files 24 May 2006 15:16:50 -0000 1.16
+++ heartbeat-2.files 26 May 2006 01:32:14 -0000 1.17
@@ -197,6 +197,7 @@
usr/lib/ocf/resource.d/heartbeat/MailTo
usr/lib/ocf/resource.d/heartbeat/Raid1
usr/lib/ocf/resource.d/heartbeat/ServeRAID
+usr/lib/ocf/resource.d/heartbeat/VIPArip
usr/lib/ocf/resource.d/heartbeat/WAS
usr/lib/ocf/resource.d/heartbeat/WinPopup
usr/lib/ocf/resource.d/heartbeat/Xen
------------------------------
Message: 5
Date: Thu, 25 May 2006 19:32:15 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
Makefile.am
Log Message:
add VIPArip (Virtual IP Address by rip2)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 18 Mar 2006 00:54:54 -0000 1.13
+++ Makefile.am 26 May 2006 01:32:14 -0000 1.14
@@ -58,6 +58,7 @@
portblock \
Raid1 \
ServeRAID \
+ VIPArip \
WAS \
WinPopup \
Xen \
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 83
********************************************
