[arch-commits] Commit in lvm2/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Sunday, June 7, 2015 @ 12:33:31
  Author: bpiotrowski
Revision: 240397

upgpkg: lvm2 2.02.120-2

Add patch fixing pvscan segfaults in the initramfs. (FS#45234)

Added:
  lvm2/trunk/0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch
Modified:
  lvm2/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch |   29 ++++++++++
 PKGBUILD                                                        |   13 +++-
 2 files changed, 39 insertions(+), 3 deletions(-)

Added: 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch
===================================================================
--- 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch	                        (rev 0)
+++ 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch	2015-06-07 10:33:31 UTC (rev 240397)
@@ -0,0 +1,29 @@
+From f8bf6410954fcf82bf28852e0dba015c6b7f19dc Mon Sep 17 00:00:00 2001
+From: Ondrej Kozina <okozina at 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 at 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)
+-- 
+2.4.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-07 10:17:58 UTC (rev 240396)
+++ PKGBUILD	2015-06-07 10:33:31 UTC (rev 240397)
@@ -5,7 +5,7 @@
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.120
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -16,7 +16,8 @@
         lvm2_hook
         sd-lvm2_install
         11-dm-initramfs.rules
-        lvm2-make-sockets-static.patch)
+        lvm2-make-sockets-static.patch
+        0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch)
 sha1sums=('34f015ee90316c1afc72f715a468028e0f89b705'
           'SKIP'
           '40ef991650555b904e73bcc3f344d736722e27ca'
@@ -23,15 +24,21 @@
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
           '86c18852409dc03f38bdd734ac3e7b54bed9c4ce'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          'b084512af42f2e16cdccd8b7ee4de27b574d1f94')
+          'b084512af42f2e16cdccd8b7ee4de27b574d1f94'
+          '4506a6d149430009ecd949c9413b5cf4b28899af')
 validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17')
 
 prepare() {
   cd LVM2.${pkgver}
+
   # enable lvmetad
   sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in
+
   # make systemd sockets static
   patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch"
+
+  # pvscan segfaults in initramfs
+  patch -p1 -i "${srcdir}/0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch"
 }
 
 build() {