From 878d1272fd18da172441d058c3b6b9b60ef01da9 Mon Sep 17 00:00:00 2001 From: Eric Cook Date: Mon, 19 Oct 2015 16:05:01 +0200 Subject: 36646: handle solaris/openzfs differences; only use -t share on solaris --- Completion/Unix/Command/_zfs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Completion/Unix/Command/_zfs') diff --git a/Completion/Unix/Command/_zfs b/Completion/Unix/Command/_zfs index cd5ad3edc..04a92e685 100644 --- a/Completion/Unix/Command/_zfs +++ b/Completion/Unix/Command/_zfs @@ -2,7 +2,7 @@ # Synced with the S11U1 man page _zfs() { - local context state line expl + local context state line expl implementation typeset -A opt_args local -a subcmds rw_properties rw_propnames ro_properties create_properties local -a share_nfs_ro_properties share_nfs_rw_properties @@ -10,6 +10,8 @@ _zfs() { local -a share_ro_properties share_rw_properties local -a difffields delegatable_perms + _pick_variant -r implementation -c 'zpool upgrade -v' openzfs='This system supports ZFS pool feature flags' solaris + subcmds=( "create" "destroy" "clone" "promote" "rename" "snapshot" "rollback" "list" "set" "get" "inherit" "mount" "unmount" -- cgit v1.2.3 From c6028f7387ad496ade9daaf76ac1683c3002bbf7 Mon Sep 17 00:00:00 2001 From: Eric Cook Date: Mon, 19 Oct 2015 16:00:21 +0200 Subject: 36642: complete jail/unjail zfs subcommands on freebsd --- ChangeLog | 3 +++ Completion/Unix/Command/_zfs | 8 ++++++++ 2 files changed, 11 insertions(+) (limited to 'Completion/Unix/Command/_zfs') diff --git a/ChangeLog b/ChangeLog index 83aef6f64..4d8b15c69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-10-19 Oliver Kiddle + * 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 \ -- cgit v1.2.3