[arch-commits] Commit in lvm2/trunk (0001-udev-initcpio.patch PKGBUILD)

[Christian Hesse]

    Date: Monday, February 7, 2022 @ 20:24:13
  Author: eworm
Revision: 436404

upgpkg: lvm2 2.03.15-1: new upstream release

Modified:
  lvm2/trunk/0001-udev-initcpio.patch
  lvm2/trunk/PKGBUILD

--------------------------+
 0001-udev-initcpio.patch |   22 +++++++++++++++++-----
 PKGBUILD                 |   14 +++++---------
 2 files changed, 22 insertions(+), 14 deletions(-)

Modified: 0001-udev-initcpio.patch
===================================================================
--- 0001-udev-initcpio.patch	2022-02-07 20:11:08 UTC (rev 436403)
+++ 0001-udev-initcpio.patch	2022-02-07 20:24:13 UTC (rev 436404)
@@ -1,6 +1,18 @@
-diff --git a/udev/69-dm-lvm-initcpio.rules.in b/udev/69-dm-lvm-initcpio.rules.in
---- a/udev/69-dm-lvm-initcpio.rules.in
-+++ b/udev/69-dm-lvm-initcpio.rules.in
+From 4df121ed7d820f5b3d3a87a2c81dbce0801d4fd3 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Mon, 7 Feb 2022 21:12:20 +0100
+Subject: [PATCH 1/1] udev initcpio
+
+apply with:
+patch -Np1 --output='udev/69-dm-lvm-initcpio.rules.in' < ../0001-udev-initcpio.patch
+---
+ udev/69-dm-lvm.rules.in | 28 +---------------------------
+ 1 file changed, 1 insertion(+), 27 deletions(-)
+
+diff --git a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in
+index 14e7dd26d..2dec88c34 100644
+--- a/udev/69-dm-lvm.rules.in
++++ b/udev/69-dm-lvm.rules.in
 @@ -54,33 +54,7 @@ ACTION!="add", GOTO="lvm_end"
  
  LABEL="lvm_scan"
@@ -30,8 +42,8 @@
 -# TODO: adjust the output of vgchange -aay so that
 -# it's better suited to appearing in the journal.
 -
--IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --udevoutput --journal=output $env{DEVNAME}"
--ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="/usr/bin/systemd-run -r --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay --nohints $env{LVM_VG_NAME_COMPLETE}"
+-IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --autoactivation event --udevoutput --journal=output $env{DEVNAME}"
+-ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="/usr/bin/systemd-run --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}"
 +RUN+="(LVM_EXEC)/lvm pvscan --background --cache --activate ay --major $major --minor $minor", ENV{LVM_SCANNED}="1"
  GOTO="lvm_end"
  

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-07 20:11:08 UTC (rev 436403)
+++ PKGBUILD	2022-02-07 20:24:13 UTC (rev 436404)
@@ -3,9 +3,9 @@
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-_tag='1d0d96a8fe7f7268d1a22e33237f6ff55f96f5cb' # git rev-parse v${pkgver//./_}
-pkgver=2.03.14
-pkgrel=2
+_tag='890c0635554075e122ef5437b5dfb28ff6fcb128' # git rev-parse v${pkgver//./_}
+pkgver=2.03.15
+pkgrel=1
 arch=('x86_64')
 url='https://sourceware.org/lvm2/'
 license=('GPL2' 'LGPL2.1')
@@ -17,13 +17,11 @@
         'lvm2_install'
         '11-dm-initramfs.rules')
 sha256sums=('SKIP'
-            'db540799e8810c0976b354792074b4956693df985564aa1ae37bc60414b22cf1'
+            'e9ab9207b805cab702a666a2deb754583e6acd4c46973898ebb4170b563f0eec'
             '00228d69679d5db15860bdf6b92746a146d0952f0d1bd27c74886ce6f22bf216'
             'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
 
 _backports=(
-  # The path is known anyway and should be the bullet proof option.
-  '221e75316f472fbf5eb2ad206b861ea255c099ed'
 )
 
 prepare() {
@@ -36,8 +34,7 @@
   done
 
   # prepare for non-systemd initcpio
-  cp udev/69-dm-lvm.rules.in udev/69-dm-lvm-initcpio.rules.in
-  patch -Np1 < ../0001-udev-initcpio.patch
+  patch -Np1 --output='udev/69-dm-lvm-initcpio.rules.in' < ../0001-udev-initcpio.patch
 
   # remove install section from systemd units that are enabled by default
   sed -i -e '/^\[Install\]$/,$d' \
@@ -107,7 +104,6 @@
   conflicts=('lvm' 'mkinitcpio<0.7')
   backup=('etc/lvm/lvm.conf'
     'etc/lvm/lvmlocal.conf')
-  options=('!makeflags')
 
   cd lvm2/