diff options
author | Axel Beckert <abe@deuxchevaux.org> | 2020-02-14 01:58:20 +0100 |
---|---|---|
committer | Axel Beckert <abe@deuxchevaux.org> | 2020-02-14 01:58:20 +0100 |
commit | bfc5d42735c1660263904ec5254cccf539a0a458 (patch) | |
tree | 9bbb81b4a53941427e6f9e65ae55027d9108df8c /Completion/Unix/Command/_zfs | |
parent | 74561cc51b8867e43cb2937ab2edfb36e2a829bf (diff) | |
parent | 643de931640e01aa246723d2038328ef33737965 (diff) | |
download | zsh-bfc5d42735c1660263904ec5254cccf539a0a458.tar.gz zsh-bfc5d42735c1660263904ec5254cccf539a0a458.zip |
Merge tag 'zsh-5.7.1-test-3' into debian
Test release: 5.7.1-test-3
Diffstat (limited to 'Completion/Unix/Command/_zfs')
-rw-r--r-- | Completion/Unix/Command/_zfs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Completion/Unix/Command/_zfs b/Completion/Unix/Command/_zfs index ce5df5877..814358bc7 100644 --- a/Completion/Unix/Command/_zfs +++ b/Completion/Unix/Command/_zfs @@ -145,7 +145,6 @@ _zfs() { # set the sorting for *size properties to false by default? rw_properties=( "aclinherit:value:(discard noallow restricted passthrough passthrough-x)" - "aclmode:value:(discard mask passthrough)" "atime:value:(on off)" "canmount:value:(on off noauto)" "checksum:value:(on off fletcher2 fletcher4 sha256 sha256+mac)" @@ -185,6 +184,15 @@ _zfs() { $share_rw_properties ) + if [[ "$OSTYPE" == "linux-gnu" ]]; then + rw_properties+=("acltype:value:(off noacl posixacl)") + elif [[ "$implementation" == "solaris" ]]; then + rw_properties+=("aclmode:value:(discard mask passthrough)") + else + rw_properties+=("aclmode:value:(discard groupmask passthrough restricted)") + fi + + create_properties=( $rw_properties "casesensitivity:value:(sensitive insensitive mixed)" |