diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Command/_zfs | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 83aef6f64..4d8b15c69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-10-19 Oliver Kiddle <opk@zsh.org> + * 36642: Eric Cook: Completion/Unix/Command/_zfs: + complete jail/unjail subcommands on freebsd + * 36646: Eric Cook: Completion/Unix/Type/_zfs_dataset, Completion/Unix/Command/_zpool, Completion/Unix/Command/_zfs: solaris/openzfs differences; only use -t share solaris diff --git a/Completion/Unix/Command/_zfs b/Completion/Unix/Command/_zfs index 04a92e685..f3869da43 100644 --- a/Completion/Unix/Command/_zfs +++ b/Completion/Unix/Command/_zfs @@ -20,6 +20,8 @@ _zfs() { "diff" "key" "help" ) + [[ $OSTYPE == freebsd<7->.* ]] && subcmds+=(jail unjail) + share_nfs_ro_properties=( "share.nfs.all" ) @@ -533,6 +535,12 @@ _zfs() { ':filesystem or volume:_zfs_dataset -t fs -t vol' ;; + ("jail"|"unjail") + _arguments \ + '1: : _jails' \ + '2:filesystem:_zfs_dataset -t fs' + ;; + ("help") _arguments -A "-*" \ - set1 \ |