|
 |
18971c |
From 0c81abbe79938423d41093b620175d97b435feb5 Mon Sep 17 00:00:00 2001
|
|
|
18971c |
From: Harald Hoyer <harald@redhat.com>
|
|
|
18971c |
Date: Thu, 3 Jul 2014 15:04:17 +0200
|
|
|
18971c |
Subject: [PATCH] lvm:module-setup.sh: check for existance of
|
|
|
18971c |
69-dm-lvm-metad.rules
|
|
|
18971c |
|
|
|
18971c |
fixup for 12819a579900b9691e2bfaf14e76fbb025851530
|
|
|
18971c |
|
|
|
18971c |
(cherry picked from commit fecc1d69e5a12c305d93e7dca64bd690a1fe8ff5)
|
|
|
18971c |
---
|
|
|
18971c |
modules.d/90lvm/module-setup.sh | 17 ++++++++++-------
|
|
|
18971c |
1 file changed, 10 insertions(+), 7 deletions(-)
|
|
|
18971c |
|
|
|
18971c |
diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
|
|
|
18971c |
index 4a49fc7d..0c5890a7 100755
|
|
|
18971c |
--- a/modules.d/90lvm/module-setup.sh
|
|
|
18971c |
+++ b/modules.d/90lvm/module-setup.sh
|
|
|
18971c |
@@ -78,13 +78,16 @@ install() {
|
|
|
18971c |
inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules
|
|
|
18971c |
|
|
|
18971c |
# Do not run lvmetad update via pvscan in udev rule - lvmetad is not running yet in dracut!
|
|
|
18971c |
- if [[ -f ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ]] && \
|
|
|
18971c |
- grep -q SYSTEMD_WANTS ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules; then
|
|
|
18971c |
- 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
|
|
|
18971c |
- sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
|
|
|
18971c |
- sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
|
|
|
18971c |
- else
|
|
|
18971c |
- 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
|
|
|
18971c |
+ if [[ -f ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ]]; then
|
|
|
18971c |
+ if grep -q SYSTEMD_WANTS ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules; then
|
|
|
18971c |
+ sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' \
|
|
|
18971c |
+ ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
|
|
|
18971c |
+ sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
|
|
|
18971c |
+ sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
|
|
|
18971c |
+ else
|
|
|
18971c |
+ sed -i -e 's/.*lvm pvscan.*/# No LVM pvscan for in dracut - lvmetad is not running yet/' \
|
|
|
18971c |
+ ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
|
|
|
18971c |
+ fi
|
|
|
18971c |
fi
|
|
|
18971c |
|
|
|
18971c |
# Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
|