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

[Thomas Bächler]

    Date: Thursday, August 13, 2015 @ 14:36:54
  Author: thomas
Revision: 243408

upgpkg: lvm2 2.02.127-1

Added:
  lvm2/trunk/0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch
Modified:
  lvm2/trunk/PKGBUILD

--------------------------------------------------+
 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch |   28 +++++++++++++++++++++
 PKGBUILD                                         |   12 ++++++---
 2 files changed, 36 insertions(+), 4 deletions(-)

Added: 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch
===================================================================
--- 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch	                        (rev 0)
+++ 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch	2015-08-13 12:36:54 UTC (rev 243408)
@@ -0,0 +1,28 @@
+From 3ea396e9d220cec55fd4e139be7ae486cb4ddb91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas at archlinux.org>
+Date: Wed, 12 Aug 2015 09:29:04 +0200
+Subject: [PATCH] udev: use += for SYSTEMD_WANTS instead of =
+
+Instead of using = to override SYSTEMD_WANTS, use += to add
+the pvscan service.
+---
+ WHATS_NEW        | 1 +
+ udev/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/udev/Makefile.in b/udev/Makefile.in
+index 390069b..c4cc2bd 100644
+--- a/udev/Makefile.in
++++ b/udev/Makefile.in
+@@ -47,7 +47,7 @@ BLKID_RULE=IMPORT{program}=\"${SBIN}\/blkid -o udev -p \$$tempnode\"
+ endif
+ 
+ ifeq ("@UDEV_SYSTEMD_BACKGROUND_JOBS@", "yes")
+-PVSCAN_RULE=ACTION\!=\"remove\", ENV{LVM_PV_GONE}==\"1\", RUN\+=\"@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\", GOTO=\"lvm_end\"\nENV{SYSTEMD_ALIAS}=\"\/dev\/block\/\$$major:\$$minor\"\nENV{ID_MODEL}=\"LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\"\nENV{SYSTEMD_WANTS}=\"lvm2-pvscan@\$$major:\$$minor.service\"
++PVSCAN_RULE=ACTION\!=\"remove\", ENV{LVM_PV_GONE}==\"1\", RUN\+=\"@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\", GOTO=\"lvm_end\"\nENV{SYSTEMD_ALIAS}=\"\/dev\/block\/\$$major:\$$minor\"\nENV{ID_MODEL}=\"LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\"\nENV{SYSTEMD_WANTS}\+=\"lvm2-pvscan@\$$major:\$$minor.service\"
+ else
+ PVSCAN_RULE=RUN\+\=\"$(LVM_EXEC)/lvm pvscan --background --cache --activate ay --major \$$major --minor \$$minor\", ENV{LVM_SCANNED}=\"1\"
+ endif
+-- 
+2.5.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-13 12:25:59 UTC (rev 243407)
+++ PKGBUILD	2015-08-13 12:36:54 UTC (rev 243408)
@@ -4,7 +4,7 @@
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.125
+pkgver=2.02.127
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
@@ -16,14 +16,16 @@
         lvm2_hook
         sd-lvm2_install
         11-dm-initramfs.rules
-        lvm2-make-sockets-static.patch)
-sha1sums=('a45bbdcbbcf6a8b4aa9c62f16bc029f687a2daa4'
+        lvm2-make-sockets-static.patch
+        0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch)
+sha1sums=('e6a4184be7c2a22725e647de131663637023e895'
           'SKIP'
           '40ef991650555b904e73bcc3f344d736722e27ca'
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
           '86c18852409dc03f38bdd734ac3e7b54bed9c4ce'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          'b084512af42f2e16cdccd8b7ee4de27b574d1f94')
+          'b084512af42f2e16cdccd8b7ee4de27b574d1f94'
+          '8cbab7e869f0f0949ae9a3104cafb76b77de52c4')
 validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17')
 
 prepare() {
@@ -34,6 +36,8 @@
 
   # make systemd sockets static
   patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch"
+  # fix udev rules
+  patch -p1 -i "${srcdir}/0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch"
 }
 
 build() {