4734ecf5fb
- fixed PATH shortener - also install /etc/system-fips in the initramfs - nbd, do not fail in hostonly mode - add ohci-pci to the list of hardcoded modules - lvm: do not run pvscan for lvmetad - network fixes - skip crypt swaps with password files - fixed i18n
37 lines
1.8 KiB
Diff
37 lines
1.8 KiB
Diff
From 297b8edc050715d563d54cfa34e42bf5909b9a7b Mon Sep 17 00:00:00 2001
|
|
From: Peter Rajnoha <prajnoha@redhat.com>
|
|
Date: Mon, 25 Nov 2013 14:38:00 +0100
|
|
Subject: [PATCH] lvm: do not run pvscan for lvmetad update
|
|
|
|
The lvmetad daemon is not yet running in initramfs so there's no
|
|
need to run pvscan (or instantiate any lvm2-pvscan systemd service).
|
|
If pvscan was called in this case (either directly or via systemd
|
|
instantiated service), it would fail because there's no lvmetad
|
|
daemon to update. This could cause confusion, especially in systemd
|
|
instantiated service which is run only once!
|
|
---
|
|
modules.d/90lvm/module-setup.sh | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
|
|
index 87374da..a220a55 100755
|
|
--- a/modules.d/90lvm/module-setup.sh
|
|
+++ b/modules.d/90lvm/module-setup.sh
|
|
@@ -76,6 +76,16 @@ install() {
|
|
fi
|
|
|
|
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 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
|
|
+
|
|
# Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
|
|
# files, but provides the one below:
|
|
inst_rules 64-device-mapper.rules
|