[arch-commits] Commit in lvm2/trunk (0001-fix-ordering-in-initramfs.patch PKGBUILD)

[Christian Hesse]

    Date: Tuesday, June 2, 2020 @ 07:40:32
  Author: eworm
Revision: 388054

upgpkg: lvm2 2.02.187-3

fix ordering in initramfs

Added:
  lvm2/trunk/0001-fix-ordering-in-initramfs.patch
Modified:
  lvm2/trunk/PKGBUILD

--------------------------------------+
 0001-fix-ordering-in-initramfs.patch |   21 +++++++++++++++++++++
 PKGBUILD                             |    6 +++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

Added: 0001-fix-ordering-in-initramfs.patch
===================================================================
--- 0001-fix-ordering-in-initramfs.patch	                        (rev 0)
+++ 0001-fix-ordering-in-initramfs.patch	2020-06-02 07:40:32 UTC (rev 388054)
@@ -0,0 +1,21 @@
+From bc5886440e8573717a525bceb46ebe99dad9bce7 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Tue, 2 Jun 2020 09:30:30 +0200
+Subject: [PATCH] fix ordering in initramfs
+---
+ scripts/lvm2_lvmetad_systemd_red_hat.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/lvm2_lvmetad_systemd_red_hat.service.in b/scripts/lvm2_lvmetad_systemd_red_hat.service.in
+index 960f32dab..0b5ce1b79 100644
+--- a/scripts/lvm2_lvmetad_systemd_red_hat.service.in
++++ b/scripts/lvm2_lvmetad_systemd_red_hat.service.in
+@@ -3,7 +3,7 @@ Description=LVM2 metadata daemon
+ Documentation=man:lvmetad(8)
+ Requires=lvm2-lvmetad.socket
+ Before=shutdown.target
+-After=lvm2-lvmetad.socket
++After=lvm2-lvmetad.socket systemd-udevd.service
+ DefaultDependencies=no
+ Conflicts=shutdown.target
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-02 07:21:24 UTC (rev 388053)
+++ PKGBUILD	2020-06-02 07:40:32 UTC (rev 388054)
@@ -4,7 +4,7 @@
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.187
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://sourceware.org/lvm2/'
 license=('GPL2' 'LGPL2.1')
@@ -12,11 +12,13 @@
 validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17'  # Alasdair G Kergon <agk at redhat.com>
               'D501A478440AE2FD130A1BE8B9112431E509039F') # Marian Csontos <marian.csontos at gmail.com>
 source=("git+https://sourceware.org/git/lvm2.git#tag=v${pkgver//./_}?signed"
+        '0001-fix-ordering-in-initramfs.patch'
         'lvm2_install'
         'lvm2_hook'
         'sd-lvm2_install'
         '11-dm-initramfs.rules')
 sha256sums=('SKIP'
+            '7a34b263e51d5a71e0595bba163de478f4f14a26015b11e682406e4adf7ba656'
             'cc51940a8437f3c8339bb9cec7e929b2cc0852ffc8a0b2463e6f67ca2b9950f6'
             '97d7c92e4954bc0108e7cd183b2eb5fe7ecc97e6f56369669e6537cb6ed45d80'
             'b749c2da0e9307b0c2c3858d024a19c268e01e393e876a284fe1a302427f72f1'
@@ -36,6 +38,8 @@
     git show "${_c}" -- ':(exclude)WHATS_NEW' | git apply
   done
 
+  patch -Np1 < ../0001-fix-ordering-in-initramfs.patch
+
   # remove install section from systemd units that are enabled by default
   sed -i -e '/^\[Install\]$/,$d' \
     scripts/dm_event_systemd_red_hat.socket.in \