chore: rd_LUKS_PARTUUID, rd_LUKS_SERIAL and rd_LUKS_UUID are deprecated

diff --git a/man/dracut.cmdline.7.asc b/man/dracut.cmdline.7.asc
index cadc999147bfdbf8b5fe2d28afce9bea1a40f33d..c3b258ec471126e00e7a345d8aeeabde119742c7 100644 (file)
--- a/man/dracut.cmdline.7.asc
+++ b/man/dracut.cmdline.7.asc
@@ -1431,8 +1431,6 @@ rd_LUKS_KEYDEV_UUID:: rd.luks.keydev.uuid
 
 rd_LUKS_KEYPATH:: rd.luks.keypath
 
-rd_LUKS_UUID:: rd.luks.uuid
-
 rd_NO_LVMCONF:: rd.lvm.conf
 
 rd_LVM_LV:: rd.lvm.lv

diff --git a/modules.d/90crypt/crypt-cleanup.sh b/modules.d/90crypt/crypt-cleanup.sh
index 6b166f775e6f93412ffa420f27ed902b53a96714..0539e70d4ac77a643ede1dfee91e1ed44e36cd83 100755 (executable)
--- a/modules.d/90crypt/crypt-cleanup.sh
+++ b/modules.d/90crypt/crypt-cleanup.sh
@@ -3,7 +3,7 @@
 # close everything which is not busy
 rm -f -- /etc/udev/rules.d/70-luks.rules > /dev/null 2>&1
 
-if ! getarg rd.luks.uuid -d rd_LUKS_UUID > /dev/null 2>&1 && getargbool 1 rd.luks > /dev/null 2>&1; then
+if ! getarg rd.luks.uuid > /dev/null 2>&1 && getargbool 1 rd.luks > /dev/null 2>&1; then
     while true; do
         local do_break="y"
         for i in /dev/mapper/luks-*; do

diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
index 01a6c6e5ea7d2d5de70fb7275878aa3a485edf18..244cb102bae9d506a5deb854e7524bc3f2114ccd 100755 (executable)
--- a/modules.d/90crypt/parse-crypt.sh
+++ b/modules.d/90crypt/parse-crypt.sh
@@ -31,9 +31,9 @@ else
         echo 'ACTION!="add|change", GOTO="luks_end"'
     } > /etc/udev/rules.d/70-luks.rules.new
 
-    PARTUUID=$(getargs rd.luks.partuuid -d rd_LUKS_PARTUUID)
-    SERIAL=$(getargs rd.luks.serial -d rd_LUKS_SERIAL)
-    LUKS=$(getargs rd.luks.uuid -d rd_LUKS_UUID)
+    PARTUUID=$(getargs rd.luks.partuuid)
+    SERIAL=$(getargs rd.luks.serial)
+    LUKS=$(getargs rd.luks.uuid)
     tout=$(getarg rd.luks.key.tout)
 
     if [ -e /etc/crypttab ]; then