From fecc1d69e5a12c305d93e7dca64bd690a1fe8ff5 Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Thu, 3 Jul 2014 15:04:17 +0200

Subject: [PATCH] lvm:module-setup.sh: check for existance of

 69-dm-lvm-metad.rules

fixup for 12819a579900b9691e2bfaf14e76fbb025851530

---

 modules.d/90lvm/module-setup.sh | 17 ++++++++++-------

 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh

index 00d4e5a..2f2b64c 100755

--- a/modules.d/90lvm/module-setup.sh

+++ b/modules.d/90lvm/module-setup.sh

@@ -80,13 +80,16 @@ install() {

     inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules

     # Do not run lvmetad update via pvscan in udev rule  - lvmetad is not running yet in dracut!

-    if [[ -f ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ]] && \

-        grep -q SYSTEMD_WANTS ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules; then

-        sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules

-        sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules

-        sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules

-    else

-        sed -i -e 's/.*lvm pvscan.*/# No LVM pvscan for in dracut - lvmetad is not running yet/' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules

+    if [[ -f ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ]]; then

+        if grep -q SYSTEMD_WANTS ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules; then

+            sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' \

+                ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules

+            sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules

+            sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules

+        else

+            sed -i -e 's/.*lvm pvscan.*/# No LVM pvscan for in dracut - lvmetad is not running yet/' \

+                ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules

+        fi

     fi

     # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules