Accepting request 326520 from home:wanglh:branches:Base:System

fix boot failure (bnc#942755) and patch renumber

OBS-URL: https://build.opensuse.org/request/show/326520
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=140
This commit is contained in:
LiuhuaMelody Wang 2015-08-25 05:57:49 +00:00 committed by Git OBS Bridge
parent b68f8cb357
commit 55f066e813
3 changed files with 37 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 25 02:27:10 UTC 2015 - lwang@suse.com
- Fix boot failed due to segfault at libc (bnc#942755)
add: lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 6 06:13:20 UTC 2015 - lwang@suse.com Thu Aug 6 06:13:20 UTC 2015 - lwang@suse.com

View File

@ -40,6 +40,7 @@ Source16: csm-converter.tar.gz
Source50: thin-provisioning-tools-v%{thin_provisioning_version}.tar.gz Source50: thin-provisioning-tools-v%{thin_provisioning_version}.tar.gz
# Upstream patches first # Upstream patches first
Patch1: lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch
# SUSE patches 1000- for LVM, 2000- for device mapper # SUSE patches 1000- for LVM, 2000- for device mapper
Patch1001: improve_probing.diff Patch1001: improve_probing.diff
@ -126,6 +127,7 @@ Volume Manager.
%prep %prep
%setup -q -n LVM2.%{version} -a 50 -a 16 %setup -q -n LVM2.%{version} -a 50 -a 16
%patch1 -p1
%patch1001 -p1 %patch1001 -p1
%patch1002 -p1 %patch1002 -p1
%patch1003 -p1 %patch1003 -p1

View File

@ -0,0 +1,29 @@
From f8bf6410954fcf82bf28852e0dba015c6b7f19dc Mon Sep 17 00:00:00 2001
From: Ondrej Kozina <okozina@redhat.com>
Date: Fri, 22 May 2015 14:48:28 +0200
Subject: [PATCH] lvmetad.c: ignore lvmetad global handle on disconnect
do not unset lvmetad global handle on disconnect. This is
hotfix for issue described in:
https://www.redhat.com/archives/linux-lvm/2015-May/msg00008.html
Reported-by: Christian Hesse <list@eworm.de>
---
lib/cache/lvmetad.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c
index 68162b6..73a382c 100644
--- a/lib/cache/lvmetad.c
+++ b/lib/cache/lvmetad.c
@@ -39,7 +39,6 @@ void lvmetad_disconnect(void)
if (_lvmetad_connected)
daemon_close(_lvmetad);
_lvmetad_connected = 0;
- _lvmetad_cmd = NULL;
}
void lvmetad_init(struct cmd_context *cmd)
--
1.8.4.5