chore: rd_LVM_LV and rd_LVM_VG are deprecated

diff --git a/man/dracut.cmdline.7.asc b/man/dracut.cmdline.7.asc
index c3b258ec471126e00e7a345d8aeeabde119742c7..6546d10eb4611f33051d75eee4241d88ff2712c8 100644 (file)
--- a/man/dracut.cmdline.7.asc
+++ b/man/dracut.cmdline.7.asc
@@ -1427,18 +1427,10 @@ live_ram:: rd.live.ram
 
 rd_NO_CRYPTTAB:: rd.luks.crypttab=0
 
-rd_LUKS_KEYDEV_UUID:: rd.luks.keydev.uuid
-
-rd_LUKS_KEYPATH:: rd.luks.keypath
-
 rd_NO_LVMCONF:: rd.lvm.conf
 
-rd_LVM_LV:: rd.lvm.lv
-
 rd_NO_LVM:: rd.lvm=0
 
-rd_LVM_VG:: rd.lvm.vg
-
 rd_NO_MDADMCONF:: rd.md.conf=0
 
 rd_NO_MDIMSM:: rd.md.imsm=0

diff --git a/modules.d/80lvmthinpool-monitor/start-thinpool-monitor.sh b/modules.d/80lvmthinpool-monitor/start-thinpool-monitor.sh
index 4a7ccd05b4c87aef5a548c214e441383f01b1a2c..7d244c6018c20a95d0160d0db21c29c95e621fe1 100755 (executable)
--- a/modules.d/80lvmthinpool-monitor/start-thinpool-monitor.sh
+++ b/modules.d/80lvmthinpool-monitor/start-thinpool-monitor.sh
@@ -2,7 +2,7 @@
 
 type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
 
-LVS=$(getargs rd.lvm.lv -d rd_LVM_LV=)
+LVS=$(getargs rd.lvm.lv)
 
 is_lvm2_thinp_device() {
     _device_path=$1

diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh
index 6cb881f4e552957e7143e44a55832cc7353f9790..2d7d2f9d7cd082d92a47d8e008f12bcc39dd96a2 100755 (executable)
--- a/modules.d/90lvm/lvm_scan.sh
+++ b/modules.d/90lvm/lvm_scan.sh
@@ -5,8 +5,8 @@
 extraargs="$*"
 type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
 
-VGS=$(getargs rd.lvm.vg -d rd_LVM_VG=)
-LVS=$(getargs rd.lvm.lv -d rd_LVM_LV=)
+VGS=$(getargs rd.lvm.vg)
+LVS=$(getargs rd.lvm.lv)
 
 # shellcheck disable=SC2174
 [ -d /etc/lvm ] || mkdir -m 0755 -p /etc/lvm

diff --git a/modules.d/90lvm/parse-lvm.sh b/modules.d/90lvm/parse-lvm.sh
index d7748827d2fc92a0795993c97367aa6bc076dd69..0e0ac9075e95d384d8f3a644ec779992c55a2170 100755 (executable)
--- a/modules.d/90lvm/parse-lvm.sh
+++ b/modules.d/90lvm/parse-lvm.sh
@@ -4,7 +4,7 @@ if [ -e /etc/lvm/lvm.conf ] && ! getargbool 1 rd.lvm.conf -d -n rd_NO_LVMCONF; t
     rm -f -- /etc/lvm/lvm.conf
 fi
 
-LV_DEVS="$(getargs rd.lvm.vg -d rd_LVM_VG=) $(getargs rd.lvm.lv -d rd_LVM_LV=)"
+LV_DEVS="$(getargs rd.lvm.vg) $(getargs rd.lvm.lv)"
 
 if ! getargbool 1 rd.lvm -d -n rd_NO_LVM \
     || { [ -z "$LV_DEVS" ] && ! getargbool 0 rd.auto; }; then