Thomas Renninger
a4aac89e0e
- Allow multiple configurations per network interface (bnc#887906) Add 0133-Allow-multiple-configurations-per-network-interface-.patch - Remove bootdev warning (bnc#881112) Add 0134-Remove-bootdev-warning-bnc-881112.patch - check for existance of 69-dm-lvm-metad.rules in modules_setup.sh, lvm module (bnc#891791) Add 0135-lvm-Fix-12819a579900b9691e2-check-for-existance-of-6.patch - Moved persistent network rule revert to another file (was not in github): Delete: 0133-Remove-70-persistent-net.rules.patch Add: 0136-Revert-95udev-rules-add-persistent-network-rule.patch - dracut-use-fipscheck-openssl.patch: Switch from Mozilla NSS sha256hmac checking to fipscheck as recommended Add: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch - warpclock: Do not use warpclock module on S390(x), hwclock does not exist there (bnc#884513) Add 0138-warpclock-Do-not-use-warpclock-module-on-S390-x-hwcl.patch OBS-URL: https://build.opensuse.org/request/show/244813 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=178
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
|
|
|