ailiopoulos/ocfs2-tools
1
0
Fork 0
forked from pool/ocfs2-tools
Code Pull Requests Activity

Accepting request 54067 from home:a_jaeger:branches:openSUSE:Factory

Browse Source 
Accept this patch, let's compile and test.

OBS-URL: https://build.opensuse.org/request/show/54067
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=22
This commit is contained in:
Coly Li 2010-12-02 07:27:52 +00:00 committed by Git OBS Bridge
parent 6448985738
commit 0428fbbc58
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fix-crm_log_init.patch Normal file
View File

@ -0,0 +1,13 @@
Index: ocfs2-tools/ocfs2_controld/pacemaker.c
===================================================================
--- ocfs2-tools.orig/ocfs2_controld/pacemaker.c
+++ ocfs2-tools/ocfs2_controld/pacemaker.c
@@ -154,7 +154,7 @@ 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, TRUE);
if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) {
log_error("Connection to our AIS plugin (CRM) failed");

7
ocfs2-tools.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Nov 20 04:34:04 UTC 2010 - aj@suse.de
- Fix crm_log_init invocation.
- remove patches that should have been removed according to
previous commits.
-------------------------------------------------------------------
Wed Oct 20 17:33:02 UTC 2010 - i@coly.li

6
ocfs2-tools.spec
View File

@ -36,7 +36,8 @@ Patch105: bug-470741-debug_start_failures.patch
Patch106: ocfs2-devel.diff
Patch107: reflink-no-syscall.patch
Patch201: bug-543119-o2dlm.patch
Patch202: fix-configure-check-libs.patch
Patch202: fix-configure-check-libs.patch
Patch203: fix-crm_log_init.patch
Url: http://oss.oracle.com/projects/ocfs2-tools/
Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
PreReq: %insserv_prereq %fillup_prereq
@ -113,7 +114,7 @@ Authors:
Oracle Corporation
%prep
%setup -n %{name} -a 2
%setup -q -n %{name} -a 2
%patch101 -p1
%patch102 -p1
%patch103 -p1
@ -123,6 +124,7 @@ Authors:
%patch107 -p0
%patch201 -p1
%patch202 -p1
%patch203 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}