|
 |
059e59 |
From 441c2c211d3c0fd8003ebb7622f44f360e75cbcd Mon Sep 17 00:00:00 2001
|
|
|
059e59 |
From: David Teigland <teigland@redhat.com>
|
|
|
059e59 |
Date: Wed, 8 Dec 2021 14:07:42 -0600
|
|
|
059e59 |
Subject: [PATCH] revert(lvm): remove lvmetad config changes
|
|
|
059e59 |
|
|
|
059e59 |
Remove support for modifying use_lvmetad and locking_type
|
|
|
059e59 |
settings in lvm.conf for lvm versions 2.2.*. Recent lvm
|
|
|
059e59 |
versions (2.3.*) do not include lvmetad or locking_type.
|
|
|
059e59 |
This cleanup simplifies code maintenance.
|
|
|
059e59 |
|
|
|
059e59 |
To use the lvm module with older versions (2.2), a user
|
|
|
059e59 |
would need to ensure that lvmetad settings are disabled
|
|
|
059e59 |
in the initrd's lvm.conf rather than relying on the lvm
|
|
|
059e59 |
dracut mode to modify their lvm.conf.
|
|
|
059e59 |
|
|
|
059e59 |
(cherry picked from commit f6f393f550625e3e1c968ef32d6d7bdd90f51d73)
|
|
|
059e59 |
|
|
|
059e59 |
Resolves: #2037955
|
|
|
059e59 |
---
|
|
|
059e59 |
modules.d/90lvm/lvm_scan.sh | 3 ---
|
|
|
059e59 |
modules.d/90lvm/module-setup.sh | 14 --------------
|
|
|
059e59 |
2 files changed, 17 deletions(-)
|
|
|
059e59 |
|
|
|
059e59 |
diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
|
|
|
059e59 |
index 43601ad1..80382407 100755
|
|
|
059e59 |
--- a/modules.d/90lvm/lvm_scan.sh
|
|
|
059e59 |
+++ b/modules.d/90lvm/lvm_scan.sh
|
|
|
059e59 |
@@ -28,10 +28,7 @@ if [ ! -e /etc/lvm/lvm.conf ]; then
|
|
|
059e59 |
echo '"r/.*/" ]'
|
|
|
059e59 |
echo '}'
|
|
|
059e59 |
|
|
|
059e59 |
- # establish LVM locking
|
|
|
059e59 |
echo 'global {'
|
|
|
059e59 |
- echo ' locking_type = 4'
|
|
|
059e59 |
- echo ' use_lvmetad = 0'
|
|
|
059e59 |
echo '}'
|
|
|
059e59 |
} > /etc/lvm/lvm.conf
|
|
|
059e59 |
lvmwritten=1
|
|
|
059e59 |
diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
|
|
|
059e59 |
index e1e6c582..0bb491f3 100755
|
|
|
059e59 |
--- a/modules.d/90lvm/module-setup.sh
|
|
|
059e59 |
+++ b/modules.d/90lvm/module-setup.sh
|
|
|
059e59 |
@@ -61,10 +61,6 @@ install() {
|
|
|
059e59 |
if [[ $hostonly ]] || [[ $lvmconf == "yes" ]]; then
|
|
|
059e59 |
if [[ -f $dracutsysrootdir/etc/lvm/lvm.conf ]]; then
|
|
|
059e59 |
inst_simple -H /etc/lvm/lvm.conf
|
|
|
059e59 |
- # FIXME: near-term hack to establish read-only locking;
|
|
|
059e59 |
- # use command-line lvm.conf editor once it is available
|
|
|
059e59 |
- sed -i -e 's/\(^[[:space:]]*\)locking_type[[:space:]]*=[[:space:]]*[[:digit:]]/\1locking_type = 4/' "${initdir}/etc/lvm/lvm.conf"
|
|
|
059e59 |
- sed -i -e 's/\(^[[:space:]]*\)use_lvmetad[[:space:]]*=[[:space:]]*[[:digit:]]/\1use_lvmetad = 0/' "${initdir}/etc/lvm/lvm.conf"
|
|
|
059e59 |
fi
|
|
|
059e59 |
|
|
|
059e59 |
export LVM_SUPPRESS_FD_WARNINGS=1
|
|
|
059e59 |
@@ -82,16 +78,6 @@ install() {
|
|
|
059e59 |
unset LVM_SUPPRESS_FD_WARNINGS
|
|
|
059e59 |
fi
|
|
|
059e59 |
|
|
|
059e59 |
- if ! [[ -e ${initdir}/etc/lvm/lvm.conf ]]; then
|
|
|
059e59 |
- mkdir -p "${initdir}/etc/lvm"
|
|
|
059e59 |
- {
|
|
|
059e59 |
- echo 'global {'
|
|
|
059e59 |
- echo 'locking_type = 4'
|
|
|
059e59 |
- echo 'use_lvmetad = 0'
|
|
|
059e59 |
- echo '}'
|
|
|
059e59 |
- } > "${initdir}/etc/lvm/lvm.conf"
|
|
|
059e59 |
- fi
|
|
|
059e59 |
-
|
|
|
059e59 |
inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules
|
|
|
059e59 |
|
|
|
059e59 |
# Do not run lvmetad update via pvscan in udev rule - lvmetad is not running yet in dracut!
|
|
|
059e59 |
|