ocfs2-tools/ocfs2_controld-pacemaker.diff
OBS User autobuild b08edf399e Accepting request 42253 from network:ha-clustering:Factory
Copy from network:ha-clustering:Factory/ocfs2-tools based on submit request 42253 from user tserong

OBS-URL: https://build.opensuse.org/request/show/42253
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocfs2-tools?expand=0&rev=25
2010-06-30 08:45:00 +00:00

27 lines
940 B
Diff

Index: ocfs2-tools/ocfs2_controld/pacemaker.c
===================================================================
--- ocfs2-tools.orig/ocfs2_controld/pacemaker.c
+++ ocfs2-tools/ocfs2_controld/pacemaker.c
@@ -31,6 +31,8 @@
#include <pacemaker/crm/ais.h>
#include <pacemaker/crm/common/cluster.h>
#include <pacemaker/crm/common/stack.h>
+#include <pacemaker/crm/common/ipc.h>
+#include <pacemaker/crm/msg_xml.h>
#include "ocfs2-kernel/kernel-list.h"
#include "o2cb/o2cb.h"
@@ -152,10 +154,10 @@ static void process_pcmk(int ci)
int setup_stack(void)
{
- crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL);
+ crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL, FALSE);
if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) {
- log_error("Connection to our AIS plugin (%d) failed", CRM_SERVICE);
+ log_error("Connection to our AIS plugin (CRM) failed");
return -1;
}