From 6a0874cad65d7949b3bcc2b082f9c6d6b9225a2a Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Thu, 23 May 2019 01:19:02 +0200 Subject: 44349: completion option updates --- Completion/Linux/Command/_cryptsetup | 20 ++++++++++++++++++-- Completion/Linux/Command/_ethtool | 18 +++++++++++++----- Completion/Linux/Command/_lsblk | 6 ++++-- Completion/Linux/Command/_ss | 1 + Completion/Linux/Command/_strace | 1 + Completion/Linux/Command/_valgrind | 6 ++++++ 6 files changed, 43 insertions(+), 9 deletions(-) (limited to 'Completion/Linux') diff --git a/Completion/Linux/Command/_cryptsetup b/Completion/Linux/Command/_cryptsetup index ddb2ad3a9..45159d0be 100644 --- a/Completion/Linux/Command/_cryptsetup +++ b/Completion/Linux/Command/_cryptsetup @@ -6,7 +6,8 @@ local -a actions state line expl (( $#words > 2 )) && ign='!' _arguments -s \ '(-v --verbose)'{-v,--verbose}'[enable verbose mode]' \ - '--debug[enable debug mode]' \ + '--debug[show debug messages]' \ + '--debug-json[show debug messages including JSON metadata]' \ '(-c --cipher)'{-c+,--cipher=}'[set cipher]:cipher specification' \ '(-h --hash)'{-h+,--hash=}'[hash algorithm]:hash algorithm' \ '(-y --verify-passphrase)'{-y,--verify-passphrase}'[query for password twice]' \ @@ -48,6 +49,7 @@ _arguments -s \ '--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]' \ + '--serialize-memory-hard-pbkdf[use global lock to serialize memory]' \ '--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' \ @@ -67,6 +69,19 @@ _arguments -s \ '--subsystem=[set subsystem label for the LUKS2 device]:subsystem' \ '--unbound[create unbound (no assigned data segment) LUKS2 keyslot]' \ '--json-file=[read or write token to json file]:json file:_files -g "*.json(-.)"' \ + '--luks2-metadata-size=[specify LUKS2 header metadata area size]:size (bytes)' \ + '--luks2-keyslots-size=[specify LUKS2 header keyslots area size]:size (bytes)' \ + '--refresh[refresh (reactivate) device with new parameters]' \ + '--keyslot-key-size=[specify size of the encryption key]:size (bits)' \ + '--keyslot-cipher=[specify cipher used for LUKS2 keyslot encryption]:cipher' \ + '--encrypt[Encrypt LUKS2 device (in-place encryption)]' \ + '--decrypt[decrypt LUKS2 device (remove encryption)]' \ + '--init-only[initialize LUKS2 reencryption in metadata only]' \ + '--reduce-device-size=[reduce data device size (move data offset)]:size (bytes)' \ + '--hotzone-size=[specify maximal reencryption hotzone size]:size (bytes)' \ + '--resilience=[specify reencryption hotzone resilience type]:resilience type:(checksum journal none)' \ + '--resilience-hash=[specify reencryption hotzone checksums hash]:string' \ + '--active-name=[override device autodetection of dm device to be reencrypted]:string' \ "${ign}(- : *)--version[show version information]" \ "${ign}(- : *)"{-\?,--help}'[display help information]' \ "${ign}(- : *)--usage[display brief usage]" \ @@ -82,6 +97,7 @@ case $state in 'resize:resize an active mapping' 'benchmark:benchmark cipher' 'repair:try to repair on-disk metadata' + 'reencrypt:reencrypt LUKS2 device' 'erase:erase all keyslots' 'convert:convert LUKS from/to LUKS2 format' 'config:set permanent configuration options for LUKS2' @@ -114,7 +130,7 @@ case $state in benchmark) args=( '--cipher=:cipher' );; luksKillSlot) args=( $device ':key slot number' );; remove|status|resize|*lose|luksSuspend|luksResume) args=( $mapping );; - erase|convert|config|repair|(luks(AddKey|Erase|RemoveKey|DelKey|UUID|Dump)|isLuks)) + erase|convert|config|repair|reencrypt|(luks(AddKey|Erase|RemoveKey|DelKey|UUID|Dump)|isLuks)) args=( $device ) ;; luks(Format|AddKey|RemoveKey|ChangeKey|ConvertKey)) diff --git a/Completion/Linux/Command/_ethtool b/Completion/Linux/Command/_ethtool index 33b7681dc..dccda4684 100644 --- a/Completion/Linux/Command/_ethtool +++ b/Completion/Linux/Command/_ethtool @@ -48,7 +48,8 @@ _arguments -C \ '--get-phy-tunable[get PHY tunable]' \ '--reset[reset hardware components]' \ '--show-fec[query device for forward error correction support]' \ - '--set-fec[configure forward error correction for device]' && return + '--set-fec[configure forward error correction for device]' \ + {-Q,--per-queue}'[apply per-queue command]' && return if [[ -n $state ]]; then case $words[CURRENT-1] in @@ -61,7 +62,7 @@ if [[ -n $state ]]; then _wanted onoff expl 'enabled' compadd off on fi ;; - autoneg|adaptive-[rt]x|raw|hex|sg|tso|ufo|gso|lro|eee|tx-lpi|downshift) + autoneg|adaptive-[rt]x|raw|hex|sg|tso|ufo|gso|lro|eee|tx-lpi|downshift|fast-link-down) _wanted onoff expl 'enabled' compadd off on ;; rx-usecs|rx-frames|rx-usecs-irq|rx-frames-irq|tx-usecs|tx-frames) ;& @@ -70,7 +71,7 @@ if [[ -n $state ]]; then 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) ;& - other|combined|tx-timer|count) + other|combined|tx-timer|count|msecs) _message -e numbers 'number' ;; speed) @@ -279,10 +280,10 @@ if [[ -n $state ]]; then _wanted behaviours expl behaviour compadd -F line - eee advertise tx-lpi tx-timer ;; --set-phy-tunable) - _wanted options expl tunable compadd -F line - downshift count + _wanted options expl tunable compadd -F line - downshift count fast-link-down msecs ;; --get-phy-tunable) - _wanted options expl tunable compadd downshift + _wanted options expl tunable compadd downshift fast-link-down ;; --reset) _wanted components expl component compadd flags dedicated all \ @@ -295,6 +296,13 @@ if [[ -n $state ]]; then _wanted encodings expl encoding compadd -F line auto off rs baser fi ;; + -Q|--pre-queue) + if (( CURRENT == 4 )); then + _wanted options expl option compadd - queue_mask + elif (( CURRENT == 6)); then + _wanted options expl option compadd -c --show-coalescing -C --coalesce + fi + ;; esac ;; esac diff --git a/Completion/Linux/Command/_lsblk b/Completion/Linux/Command/_lsblk index a95ebe776..8a9bc18bf 100644 --- a/Completion/Linux/Command/_lsblk +++ b/Completion/Linux/Command/_lsblk @@ -1,11 +1,12 @@ #compdef lsblk local sep ret=1 -local -a values dedup suf=( -qS , ) +local -a values dedup suf local curcontext="$curcontext" state line expl typeset -A opt_args _arguments -C -s -S \ + '(H -E --dedup)'{-E+,--dedup=}'[de-duplicate output by specified column]:column:->columns' \ '(H -a --all)'{-a,--all}'[print all devices]' \ '(H -b --bytes)'{-b,--bytes}'[print size in bytes rather than in human readable format]' \ '(H -d --nodeps)'{-d,--nodeps}"[don't print slaves or holders]" \ @@ -30,7 +31,7 @@ _arguments -C -s -S \ '(H)'{-i,--ascii}'[output ascii characters only]' \ '(H)'{-J,--json}'[use JSON output format]' \ '(H)'{-l,--list}'[use list format output]' \ - '(H)'{-t,--tree}'[use tree format output]' \ + '(H)'{-T+,--tree=}'[use tree format output]:column:->columns' \ '(H)'{-P,--pairs}'[use key="value" output format]' \ '(H)'{-r,--raw}'[use raw output format]' \ + 'H' \ @@ -44,6 +45,7 @@ case $state in ;| *list) dedup=( ${(Ms.,.)PREFIX##*,} ${(Ms.,.)SUFFIX%%,*} ) + suf=( -qS , ) compset -S ',*' && suf=() compset -P '*,' ;| diff --git a/Completion/Linux/Command/_ss b/Completion/Linux/Command/_ss index b1bfa207c..f19b94995 100644 --- a/Completion/Linux/Command/_ss +++ b/Completion/Linux/Command/_ss @@ -20,6 +20,7 @@ _arguments -C -s \ "($info -i --info)"{-i,--info}'[show internal TCP information]' \ "($info)--tipcinfo[show internal tipc socket information]" \ "($info -s --summary)"{-s,--summary}'[print summary statistics]' \ + "($info)--tos[show tos and priority information]" \ "($info -b --bpf)"{-b,--bpf}'[show bpf filter socket information]' \ "($info -E --events)"{-E,--events}'[continually display sockets as they are destroyed]' \ "($info -Z --context)"{-Z,--context}'[display process SELinux security contexts]' \ diff --git a/Completion/Linux/Command/_strace b/Completion/Linux/Command/_strace index 83ccc6afb..e6dc88659 100644 --- a/Completion/Linux/Command/_strace +++ b/Completion/Linux/Command/_strace @@ -19,6 +19,7 @@ _arguments -C -s \ '(-c)-T[show the time spent in system calls]' \ '(-xx)-x[print all non-ASCII strings in hexadecimal string format]' \ '(-x)-xx[print all strings in hexadecimal string format]' \ + '-X+[set the format for printing of named constants and flags]:format:(raw abbrev verbose)' \ '(-c -yy)-y[print paths associated with file descriptor arguments]' \ '(-c -y)-yy[print protocol specific information associated with socket file descriptors]' \ '(-C -i -k -r -ff -t -tt -ttt -T -y -yy)-c[count time, calls, and errors for each system call and report a summary]' \ diff --git a/Completion/Linux/Command/_valgrind b/Completion/Linux/Command/_valgrind index 21b7d88c7..4a710e7f7 100644 --- a/Completion/Linux/Command/_valgrind +++ b/Completion/Linux/Command/_valgrind @@ -39,6 +39,8 @@ common_report_errors=( '--exit-on-first-error=-[exit on the first error]:enable:(yes no)' \ '--error-exitcode=-[exit code to return if errors found]:exit code' \ '--error-markers=-[add lines with begin/end markers before/after]:markers (begin,end)' \ + '(--show-error-list)-s[show detected errors list and suppression counts at exit]' \ + '--show-error-list=-[show detected errors list and suppression counts at exit]:enable [no]:(yes no)' '--keep-debuginfo=-[keep symbols etc for unloaded code]:enable:(yes no)' \ '--show-below-main=-[continue stack traces below main()]:enable [no]:(yes no)' \ '--default-suppression=-[load default suppressions]:enable [yes]:(yes no)' \ @@ -84,6 +86,7 @@ args_addrcheck=( args_drd=( $common_own_malloc $common_read_varinfo + $common_report_errors '--check-stack-var=-[detect data races on stack variables]:enable [no]:(yes no)' '--exclusive-threshold=-[print an error if any mutex or writer lock is held longer than specified time]:time (ms)' '--first-race-only=-[report only the first detected data race]:enable [no]:(yes no)' @@ -111,6 +114,7 @@ args_drd=( args_memcheck=( $args_addrcheck $common_read_varinfo + $common_report_errors ) args_cachegrind=( @@ -125,6 +129,7 @@ args_cachegrind=( args_helgrind=( $common_own_malloc $common_read_varinfo + $common_report_errors '--free-is-write=-[treat heap frees as writes]:enable [no]:(yes no)' '--track-lockorders=-[show lock ordering errors]:enable [yes]:(no yes)' '--history-level=-[specify amount of history to show for data races]:level [full]:(( @@ -186,6 +191,7 @@ args_exp_dhat=( args_exp_sgcheck=( $common_partial + $common_report_errors '--enable-sg-checks=-[enable stack & global array checking]:enable [yes]:(yes no)' ) -- cgit 1.4.1