From 5cf1d6dfd149a83bd6c4418518dc9de430834b99 Mon Sep 17 00:00:00 2001 From: Teddy Heinen Date: Sat, 26 Oct 2019 10:38:34 -0500 Subject: github #40: Teddy Heinen: adjust zfs completion to use acltype on linux instead of aclmode --- Completion/Unix/Command/_zfs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Completion/Unix/Command/_zfs b/Completion/Unix/Command/_zfs index ce5df5877..c720cbf74 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 [[ "$OSTYPE" == "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)" -- cgit 1.4.1