forked from pool/ocfs2-tools
593f464341
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=33
25 lines
900 B
Diff
25 lines
900 B
Diff
Index: ocfs2-tools/ocfs2_controld/pacemaker.c
|
|
===================================================================
|
|
--- ocfs2-tools.orig/ocfs2_controld/pacemaker.c
|
|
+++ ocfs2-tools/ocfs2_controld/pacemaker.c
|
|
@@ -30,7 +30,9 @@
|
|
#include <pacemaker/crm/crm.h>
|
|
#include <pacemaker/crm/ais.h>
|
|
#include <pacemaker/crm/common/cluster.h>
|
|
-#include <pacemaker/crm/common/stack.h>
|
|
+#include <pacemaker/crm/cluster/stack.h>
|
|
+#include <pacemaker/crm/common/ipc.h>
|
|
+#include <pacemaker/crm/msg_xml.h>
|
|
|
|
#include "ocfs2-kernel/kernel-list.h"
|
|
#include "o2cb/o2cb.h"
|
|
@@ -155,7 +157,7 @@ int setup_stack(void)
|
|
crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL);
|
|
|
|
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;
|
|
}
|
|
|