From 47430bcd7cb2fade4d8753d920a2720eeca52f6a Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Tue, 23 Jan 2018 11:01:55 +0100 Subject: 42317: completion option updates for commands that have had recent updates --- Completion/Linux/Command/_cryptsetup | 25 ++++++++++++++++++++++++- Completion/Linux/Command/_ethtool | 4 ++-- Completion/Linux/Command/_tune2fs | 1 - 3 files changed, 26 insertions(+), 4 deletions(-) (limited to 'Completion/Linux') diff --git a/Completion/Linux/Command/_cryptsetup b/Completion/Linux/Command/_cryptsetup index 00b0f2f95..ea7152ea1 100644 --- a/Completion/Linux/Command/_cryptsetup +++ b/Completion/Linux/Command/_cryptsetup @@ -25,6 +25,7 @@ _arguments -s \ '(-i --iter-time)'{-i+,--iter-time=}'[set password processing duration]:duration (milliseconds)' \ '(-q --batch-mode)'{-q,--batch-mode}"[don't ask for confirmation]" \ '(-t --timeout)'{-t+,--timeout=}'[set password prompt timeout]:timeout (seconds)' \ + '--progress-frequency=[specify progress line update interval]:interval (seconds)' \ '(-T --tries)'{-T+,--tries=}'[set maximum number of retries]:number of retries' \ '--align-payload=[set payload alignment]:sectors' \ '--header-backup-file=[specify file with LUKS header and keyslots backup]:file:_files' \ @@ -39,10 +40,30 @@ _arguments -s \ '--tcrypt-system[device is system TCRYPT drive (with bootloader)]' \ '--tcrypt-backup[use backup (secondary) TCRYPT header]' \ '--veracrypt[scan also for VeraCrypt compatible device]' \ + '--veracrypt-pim=[specify personal iteration multiplier for VeraCrypt compatible device]:multiplier' \ + '--veracrypt-query-pim[query personal iteration multiplier for VeraCrypt compatible device]' \ '(-M --type)'{-M+,--type=}'[specify type of device metadata]:type:(luks plain loopaes tcrypt)' \ '--force-password[disable password quality check (if enabled)]' \ '--perf-same_cpu_crypt[use dm-crypt same_cpu_crypt performance compatibility option]' \ '--perf-submit_from_crypt_cpus[use dm-crypt submit_from_crypt_cpus performance compatibility option]' \ + '--deferred[device removal is deferred until the last user closes it]' \ + '--pbkdf=[specify PBKDF algorithm for LUKS2]:algorithm:(argon2i argon2id pbkdf2)' \ + '--pbkdf-memory=[specify PBKDF memory cost limit]:limit (kilobytes)' \ + '--pbkdf-parallel=[specify PBKDF parallel cost]:threads' \ + '--pbkdf-force-iterations=[specify PBKDF iterations cost]:cost' \ + '--priority=[specify keyslot priority]:priority:(ignore normal prefer)' \ + '--disable-locks[disable locking of on-disk metadata]' \ + '--disable-keyring[disable loading volume keys via kernel keyring]' \ + '(-I --integrity)'{-I+,--integrity=}'[specify data integrity algorithm (LUKS2 only)]:algorithm' \ + '--integrity-no-journal[disable journal for integrity device]' \ + "--integrity-no-wipe[don't wipe device after format]" \ + "--token-only[don't ask for passphrase if activation by token fails]" \ + '--token-id=[specify token number]:number [any]' \ + '--key-description=[specify key description]:description' \ + '--sector-size=[specify encryption sector size]:size [512 bytes]' \ + '--persistent[set activation flags persistent for device]' \ + '--label=[set label for the LUKS2 device]:label' \ + '--subsystem=[set subsystem label for the LUKS2 device]:subsystem' \ '(- : *)--version[show version information]' \ '(- : *)'{-\?,--help}'[display help information]' \ '(- : *)--usage[display brief usage]' \ @@ -59,6 +80,8 @@ case $state in 'benchmark:benchmark cipher' 'repair:try to repair on-disk metadata' 'erase:erase all keyslots' + 'convert:convert LUKS from/to LUKS2 format' + 'config:set permanent configuration options for LUKS2' 'luksFormat:initialize a LUKS partition' 'luksAddKey:add a new key' 'luksRemoveKey:remove a key' @@ -86,7 +109,7 @@ case $state in benchmark) args=( '--cipher=:cipher' );; luksKillSlot) args=( $device ':key slot number' );; remove|status|resize|*lose|luksSuspend|luksResume) args=( $mapping );; - erase|repair|(luks(AddKey|Erase|RemoveKey|DelKey|UUID|Dump)|isLuks)) + erase|convert|config|repair|(luks(AddKey|Erase|RemoveKey|DelKey|UUID|Dump)|isLuks)) args=( $device ) ;; luks(Format|AddKey|RemoveKey|ChangeKey)) diff --git a/Completion/Linux/Command/_ethtool b/Completion/Linux/Command/_ethtool index 612841c1f..7c62fd7f7 100644 --- a/Completion/Linux/Command/_ethtool +++ b/Completion/Linux/Command/_ethtool @@ -64,7 +64,7 @@ if [[ -n $state ]]; then rx-usecs|rx-frames|rx-usecs-irq|rx-frames-irq|tx-usecs|tx-frames) ;& tx-usecs-irq|tx-frames-irq|stats-block-usecs|pkt-rate-low|rx-usecs-low) ;& rx-frames-low|tx-usecs-low|tx-frames-low|pkt-rate-high|rx-usecs-high) ;& - rx-frames-high|tx-usecs-high|tx-frames-high|sample-interval|rx-mini) ;& + rx-frames-high|tx-usecs-high|tx-frames-high|sample-interval|dmac|rx-mini) ;& rx-jumbo|offset|length|magic|value|phyad|proto|tos|tclass|l4proto|src-port) ;& dst-port|spi|l4data|vlan-etype|vlan|user-def|action|vf|queue|loc|delete) ;& other|combined|tx-timer|count) @@ -143,7 +143,7 @@ if [[ -n $state ]]; then -C|--coalesce) _wanted settings expl 'coalescing setting' compadd -F line -M 'r:|-=* r:|=*' - \ adaptive-{r,t}x {r,t}x-{usecs,frames}{,-irq,-high,-low} \ - stats-block-usecs pkt-rate-{low,high} sample-interval + stats-block-usecs pkt-rate-{low,high} sample-interval dmac ;; -G|--set-ring) _values -S ' ' -w 'ring parameter' \ diff --git a/Completion/Linux/Command/_tune2fs b/Completion/Linux/Command/_tune2fs index 1fc1709e4..af120e279 100644 --- a/Completion/Linux/Command/_tune2fs +++ b/Completion/Linux/Command/_tune2fs @@ -25,7 +25,6 @@ _arguments -s -S \ '-M+[set the last-mounted directory for the filesystem]:directory:_files -/' \ '-o+[mount options]:options:_values -s , debug bsdgroups user_xattr acl uid16 journal_data journal_data_ordered journal_data_writeback nobarrier block_validity discard nodelalloc' \ '-O+[set or clear filesystem features]: :_values -s , feature dir_index dir_nlink encrypt extentextent extra_isize filetype flex_bg has_journalhuge_file large_file metadata_csum mmp project quota read-only resize_inode sparse_super uninit_bg' \ - '-p+[set MMP check interval]:interval (seconds) [5]' \ '-r+[set the number of reserved filesystem blocks]:number' \ '-Q+[set quota feature on the superblock]: :_values -s , "quota option" usrquota grpquota prjquota' \ '-s+[set sparse super feature]:state:((0\:off 1\:on))' \ -- cgit 1.4.1