Merge 9092a50dbf into f6793bbcf0

And also use it to list suitable block devices.

shell-completion/bash/systemd-cryptenroll

@@ -40,8 +40,8 @@ __get_tpm2_devices() {
 
 __get_block_devices() {
     local i
-    for i in /dev/*; do
+    for i in $(systemd-cryptenroll --list-devices); do
-        [ -b "$i" ] && printf '%s\n' "$i"
+        [ -L "$i" ] || printf '%s\n' "$i"
     done
 }
 
@@ -50,7 +50,7 @@ _systemd_cryptenroll() {
     local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
     local -A OPTS=(
         [STANDALONE]='-h --help --version
-                     --password --recovery-key'
+                     --password --recovery-key --list-devices'
         [ARG]='--unlock-key-file
                --unlock-fido2-device
                --unlock-tpm2-device