[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_activation_generator.patch)

[Christian Hesse]

    Date: Monday, May 30, 2016 @ 11:02:39
  Author: eworm
Revision: 268740

upgpkg: lvm2 2.02.154-2

apply 'lvm2_activation_generator: don't create full context for liblvm2app' FS#49483

Added:
  lvm2/trunk/lvm2_activation_generator.patch
Modified:
  lvm2/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   11 +++++++--
 lvm2_activation_generator.patch |   43 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-30 03:19:51 UTC (rev 268739)
+++ PKGBUILD	2016-05-30 09:02:39 UTC (rev 268740)
@@ -5,7 +5,7 @@
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.154
-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
+	lvm2_activation_generator.patch)
 sha1sums=('6b594f2b23e85bf5bf74a4c4a75817e84e5a0853'
           'SKIP'
           '056bb0227d07e35a3d365db02f439585314cfc76'
@@ -23,7 +24,8 @@
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
           'f6ac78163ab3aba5b51a71655d6e53d05014bfa4'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          'b084512af42f2e16cdccd8b7ee4de27b574d1f94')
+          'b084512af42f2e16cdccd8b7ee4de27b574d1f94'
+          '8f9804c11a09086f4954a3b8a19623e004b40b02')
 validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17')
 
 prepare() {
@@ -34,6 +36,9 @@
 
   # make systemd sockets static
   patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch"
+
+  # lvm2_activation_generator: don't create full context for liblvm2app
+  patch -p1 -i "${srcdir}/lvm2_activation_generator.patch"
 }
 
 build() {

Added: lvm2_activation_generator.patch
===================================================================
--- lvm2_activation_generator.patch	                        (rev 0)
+++ lvm2_activation_generator.patch	2016-05-30 09:02:39 UTC (rev 268740)
@@ -0,0 +1,43 @@
+From 591ef307b30c2d828b2a0c59918203f970974bbb Mon Sep 17 00:00:00 2001
+From: David Teigland <teigland at redhat.com>
+Date: Tue, 17 May 2016 12:03:25 -0500
+Subject: lvm2_activation_generator: don't create full context for liblvm2app
+
+Don't use lvm_init() to create a full command context, which
+does a lot of command setup (like connecting to daemons), which
+is unnecessary for simply reading a value from lvm.conf.
+
+Passing a NULL context arg to the lvm_config_ function is now
+allowed, in which case lvm.conf is read without doing lvm
+command setup.
+---
+ scripts/lvm2_activation_generator_systemd_red_hat.c | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c
+index 62467bd..d83e721 100644
+--- a/scripts/lvm2_activation_generator_systemd_red_hat.c
++++ b/scripts/lvm2_activation_generator_systemd_red_hat.c
+@@ -69,16 +69,10 @@ static void kmsg(int log_level, const char *format, ...)
+ 
+ static void lvm_get_use_lvmetad_and_lvmpolld(int *use_lvmetad, int *use_lvmpolld)
+ {
+-	lvm_t lvm;
+-
+ 	*use_lvmetad = *use_lvmpolld = 0;
+-	if (!(lvm = lvm_init(NULL))) {
+-		kmsg(LOG_ERR, "LVM: Failed to initialize library context for activation generator.\n");
+-		return;
+-	}
+-	*use_lvmetad = lvm_config_find_bool(lvm, LVM_CONF_USE_LVMETAD, 0);
+-	*use_lvmpolld = lvm_config_find_bool(lvm, LVM_CONF_USE_LVMPOLLD, 0);
+-	lvm_quit(lvm);
++
++	*use_lvmetad = lvm_config_find_bool(NULL, LVM_CONF_USE_LVMETAD, 0);
++	*use_lvmpolld = lvm_config_find_bool(NULL, LVM_CONF_USE_LVMPOLLD, 0);
+ }
+ 
+ static int register_unit_with_target(const char *dir, const char *unit, const char *target)
+-- 
+cgit v0.12-38-g4150
+