From 2ccacdd57ca07d9c6512c773dda4255cb776204c Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Thu, 21 Nov 2024 12:50:26 +0100 Subject: [PATCH] bash-completion: add --list-devices to systemd-cryptenroll And also use it to list suitable block devices. --- shell-completion/bash/systemd-cryptenroll | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/shell-completion/bash/systemd-cryptenroll b/shell-completion/bash/systemd-cryptenroll index 7a11a3f3dc7..6ae9bb3840a 100644 --- a/shell-completion/bash/systemd-cryptenroll +++ b/shell-completion/bash/systemd-cryptenroll @@ -38,19 +38,12 @@ __get_tpm2_devices() { done } -__get_block_devices() { - local i - for i in /dev/*; do - [ -b "$i" ] && printf '%s\n' "$i" - done -} - _systemd_cryptenroll() { local comps 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 @@ -116,7 +109,7 @@ _systemd_cryptenroll() { return 0 fi - comps=$(__get_block_devices) + comps=$(systemd-cryptenroll --list-devices) COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) return 0 }