shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-08 08:58:27 +03:00
Code

Merge pull request #31022 from aafeijoo-suse/bash-completion-cryptenroll-2

Browse Source 
fix typo and add some missing options to bash-completion
This commit is contained in:
Luca Boccassi 2024-01-19 18:00:10 +00:00 committed by GitHub
commit 201f6241ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shell-completion/bash/systemd-cryptenroll
View File

@ -44,7 +44,7 @@ __get_block_devices() {
done
}
_systemd-cryptenroll() {
_systemd_cryptenroll() {
local comps
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} words cword
local -A OPTS=(
@ -59,11 +59,14 @@ _systemd-cryptenroll() {
--fido2-with-user-presence
--fido2-with-user-verification
--tpm2-device
--tpm2-device-key
--tpm2-seal-key-handle
--tpm2-pcrs
--tpm2-public-key
--tpm2-public-key-pcrs
--tpm2-signature
--tpm2-with-pin
--tpm2-pcrlock
--wipe-slot'
)
@ -71,7 +74,7 @@ _systemd-cryptenroll() {
if __contains_word "$prev" ${OPTS[ARG]}; then
case $prev in
--unlock-key-file|--tpm2-public-key|--tpm2-signature)
--unlock-key-file|--tpm2-device-key|--tpm2-public-key|--tpm2-signature|--tpm2-pcrlock)
comps=$(compgen -A file -- "$cur")
compopt -o filenames
;;
@ -111,4 +114,4 @@ _systemd-cryptenroll() {
return 0
}
complete -F _systemd-cryptenroll systemd-cryptenroll
complete -F _systemd_cryptenroll systemd-cryptenroll

4
shell-completion/bash/systemd-dissect
View File

@ -37,6 +37,8 @@ _systemd_dissect() {
--in-memory'
[ARG]='-m --mount -M
-u --umount -U
--attach
--detach
-l --list
--mtree
--with
@ -72,7 +74,7 @@ _systemd_dissect() {
if __contains_word "$prev_1" ${OPTS[ARG]}; then
case $prev_1 in
-l|--list|--mtree|-m|--mount|-M|-x|--copy-from|-a|--copy-to|--verity-data|--validate|--with)
-l|--list|--mtree|-m|--mount|-M|--attach|--detach|-x|--copy-from|-a|--copy-to|--verity-data|--validate|--with)
comps=$(compgen -A file -- "$cur")
compopt -o filenames
;;

2
src/dissect/dissect.c
View File

@ -150,7 +150,7 @@ static int help(void) {
" -u --umount Unmount the image from the specified directory\n"
" -U Shortcut for --umount --rmdir\n"
" --attach Attach the disk image to a loopback block device\n"
" --detach Detach a loopback block device gain\n"
" --detach Detach a loopback block device again\n"
" -l --list List all the files and directories of the specified\n"
" OS image\n"
" --mtree Show BSD mtree manifest of OS image\n"