diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2013-11-07 14:52:31 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2013-11-07 14:52:31 +0100 |
| commit | d799ac78a744a5359563af55b4dee9e91255a1dc (patch) | |
| tree | 73475ed7089e6ee050085a96b88018994b43bdfc /Completion/Linux/Command | |
| parent | abfb3b136a4ad5b2832fb7d920442a2bb28c0697 (diff) | |
| parent | 375115c7dfd6dff576915d25fe2ecdd381dd9d81 (diff) | |
| download | zsh-d799ac78a744a5359563af55b4dee9e91255a1dc.tar.gz zsh-d799ac78a744a5359563af55b4dee9e91255a1dc.zip | |
Merge branch 'upstream' into debian
Diffstat (limited to 'Completion/Linux/Command')
| -rw-r--r-- | Completion/Linux/Command/_brctl | 6 | ||||
| -rw-r--r-- | Completion/Linux/Command/_btrfs | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Completion/Linux/Command/_brctl b/Completion/Linux/Command/_brctl index 877326821..6e65d122c 100644 --- a/Completion/Linux/Command/_brctl +++ b/Completion/Linux/Command/_brctl @@ -10,10 +10,12 @@ if (( CURRENT == 2 )); then show:show\ all\ current\ bridge\ instances addif:add\ interface\ to\ bridge delif:remove\ interface\ from\ bridge + hairpin:toggle\ hairpin\ mode\ on\ a\ port showmacs:show\ a\ list\ of\ learned\ MAC\ addresses setageing:set\ MAC\ address\ ageing\ time setgcint:set\ grabage\ collection\ interval stp:control\ use\ of\ spanning\ tree\ protocol + showstp:show\ bridge\ stp\ info setbridgeprio:set\ bridge\ priority setfd:set\ bridge\ forward\ delay sethello:set\ bridge\ hello\ time @@ -41,7 +43,7 @@ else setbridgeprio) _message -e priority 'priority' ;; - setpathcost|setportprio) + setpathcost|setportprio|hairpin) _message -e ports 'port' ;; stp) @@ -56,6 +58,8 @@ else _message -e cost 'cost' elif [[ $subcmd == setportprio ]]; then _message -e priority 'priority' + elif [[ $subcmd == hairpin ]]; then + _message -e onoff 'on|off' fi fi fi diff --git a/Completion/Linux/Command/_btrfs b/Completion/Linux/Command/_btrfs index eac827050..da2514e99 100644 --- a/Completion/Linux/Command/_btrfs +++ b/Completion/Linux/Command/_btrfs @@ -1,7 +1,7 @@ #compdef btrfs local curcontext="$curcontext" curstate state line expl grp cmd ret=1 -local -a groups args +local -a groups args cmds_1 cmds_2 cmds_3 cmds_4 cmds_5 cmds_6 groups=( subvolume filesystem device scrub balance inspect-internal help version ) cmds_1=( create delete list snapshot get-default set-default find-new help ) |