40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
|
From 416e3ebbabcf7a7786aeb642f5fcbd62a7850ff0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Renninger <trenn@suse.de>
|
||
|
|
Date: Thu, 14 Aug 2014 15:50:29 +0200
|
||
|
|
Subject: lvm: Fix 12819a579900b9691e2 check for existance of
|
||
|
|
69-dm-lvm-metad.rules
|
||
|
|
|
||
|
|
Move last sed into if condition that checks for 69-dm-lvm-metad.rules existence
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
||
|
|
---
|
||
|
|
modules.d/90lvm/module-setup.sh | 9 +++++----
|
||
|
|
1 files changed, 5 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
|
||
|
|
index 77f9e9d..6fda69e 100755
|
||
|
|
--- a/modules.d/90lvm/module-setup.sh
|
||
|
|
+++ b/modules.d/90lvm/module-setup.sh
|
||
|
|
@@ -84,13 +84,14 @@ 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
|
||
|
|
+ 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
|
||
|
|
+ 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
|
||
|
|
--
|
||
|
|
1.7.6.1
|
||
|
|
|