Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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 andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
5. Linux-HA CVS: resources by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 14 Aug 2006 09:59:21 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/admin
Modified Files:
crm_mon.c
Log Message:
Applied patch from Matt Stancliff to allow building on platforms that lack
ncurses
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_mon.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- crm_mon.c 18 Jul 2006 06:15:54 -0000 1.29
+++ crm_mon.c 14 Aug 2006 15:59:18 -0000 1.30
@@ -1,4 +1,4 @@
-/* $Id: crm_mon.c,v 1.29 2006/07/18 06:15:54 andrew Exp $ */
+/* $Id: crm_mon.c,v 1.30 2006/08/14 15:59:18 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -213,12 +213,14 @@
make_daemon(daemonize, pid_file);
+#if CURSES_ENABLED
if(as_console) {
initscr();
cbreak();
noecho();
}
-
+#endif
+
crm_info("Starting %s", crm_system_name);
mainloop = g_main_new(FALSE);
@@ -243,11 +245,13 @@
crm_info("Exiting %s", crm_system_name);
+#if CURSES_ENABLED
if(as_console) {
echo();
nocbreak();
endwin();
}
+#endif
return 0;
}
------------------------------
Message: 2
Date: Mon, 14 Aug 2006 10:31:38 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
pengine.c
Log Message:
Use new name for macro
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- pengine.c 14 Aug 2006 09:14:45 -0000 1.121
+++ pengine.c 14 Aug 2006 16:31:38 -0000 1.122
@@ -1,4 +1,4 @@
-/* $Id: pengine.c,v 1.121 2006/08/14 09:14:45 andrew Exp $ */
+/* $Id: pengine.c,v 1.122 2006/08/14 16:31:38 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -127,9 +127,9 @@
}
} else {
- pe_config_warn("No value specified for cluster"
- " preference: %s",
- series[series_id].param);
+ crm_config_warn("No value specified for cluster"
+ " preference: %s",
+ series[series_id].param);
}
seq = get_last_sequence(PE_WORKING_DIR,
series[series_id].name);
------------------------------
Message: 3
Date: Mon, 14 Aug 2006 10:32:05 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
xml.c
Log Message:
Patch for building without bzlib
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- xml.c 4 Aug 2006 09:47:21 -0000 1.102
+++ xml.c 14 Aug 2006 16:32:05 -0000 1.103
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.102 2006/08/04 09:47:21 andrew Exp $ */
+/* $Id: xml.c,v 1.103 2006/08/14 16:32:05 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -497,7 +497,6 @@
crm_data_t*
file2xml(FILE *input, gboolean compressed)
{
- int rc = 0;
char *buffer = NULL;
gboolean work_done = FALSE;
crm_data_t *new_obj = NULL;
@@ -510,6 +509,7 @@
if(compressed) {
#if HAVE_BZLIB_H
+ int rc = 0;
BZFILE *bz_file = BZ2_bzReadOpen(&rc, input, 0, 0, NULL, 0);
if ( rc != BZ_OK ) {
BZ2_bzReadClose ( &rc, bz_file);
------------------------------
Message: 4
Date: Mon, 14 Aug 2006 10:32:22 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/pengine
Modified Files:
complex.c
Log Message:
Use new name for macro
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/complex.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- complex.c 3 Aug 2006 14:21:49 -0000 1.6
+++ complex.c 14 Aug 2006 16:32:21 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Id: complex.c,v 1.6 2006/08/03 14:21:49 andrew Exp $ */
+/* $Id: complex.c,v 1.7 2006/08/14 16:32:21 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -268,9 +268,9 @@
if(value != NULL && safe_str_neq("default", value)) {
(*rsc)->next_role = text2role(value);
if((*rsc)->next_role == RSC_ROLE_UNKNOWN) {
- pe_config_err("%s: Unknown value for "
- XML_RSC_ATTR_TARGET_ROLE": %s",
- (*rsc)->id, value);
+ crm_config_err("%s: Unknown value for "
+ XML_RSC_ATTR_TARGET_ROLE": %s",
+ (*rsc)->id, value);
}
}
------------------------------
Message: 5
Date: Mon, 14 Aug 2006 10:32:54 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
IPaddr.in
Log Message:
Indicate when we're doing a deeper monitor action
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/IPaddr.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- IPaddr.in 14 Aug 2006 09:33:47 -0000 1.49
+++ IPaddr.in 14 Aug 2006 16:32:53 -0000 1.50
@@ -667,6 +667,8 @@
return $rc
fi
+ ocf_log info "Checking IP stack"
+
case "$SYSTYPE" in
Linux)
# -c count -t timetolive -q(uiet) -n(umeric) -W timeout
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 33, Issue 28
********************************************
