From 248ae0b77eaa416026ccd491d719d5ba543933a8 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Tue, 29 Oct 2019 15:53:04 +0100 Subject: unposted: tweak to check for openzfs rather than Solaris --- ChangeLog | 8 ++++++++ Completion/Unix/Command/_zfs | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 87adb1fe9..21812799a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2019-10-29 Oliver Kiddle + + * unposted: Completion/Unix/Command/_zfs: tweak to check for + openzfs rather than Solaris + + * github #40: Teddy Heinen: Completion/Unix/Command/_zfs: + adjust zfs completion to use acltype on linux instead of aclmode + 2019-10-28 Peter Stephenson * 44864: Src/jobs.c: Avoid infinite loop in interactive mode diff --git a/Completion/Unix/Command/_zfs b/Completion/Unix/Command/_zfs index c720cbf74..814358bc7 100644 --- a/Completion/Unix/Command/_zfs +++ b/Completion/Unix/Command/_zfs @@ -186,7 +186,7 @@ _zfs() { if [[ "$OSTYPE" == "linux-gnu" ]]; then rw_properties+=("acltype:value:(off noacl posixacl)") - elif [[ "$OSTYPE" == "solaris*" ]]; then + elif [[ "$implementation" == "solaris" ]]; then rw_properties+=("aclmode:value:(discard mask passthrough)") else rw_properties+=("aclmode:value:(discard groupmask passthrough restricted)") -- cgit 1.4.1