summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kiddle <okiddle@yahoo.co.uk>2019-10-29 15:53:04 +0100
committerOliver Kiddle <okiddle@yahoo.co.uk>2019-10-29 15:55:25 +0100
commit248ae0b77eaa416026ccd491d719d5ba543933a8 (patch)
treebfa28da0e8c5b1800438c3b82f2b434475a4cb61
parent5cf1d6dfd149a83bd6c4418518dc9de430834b99 (diff)
downloadzsh-248ae0b77eaa416026ccd491d719d5ba543933a8.tar.gz
zsh-248ae0b77eaa416026ccd491d719d5ba543933a8.tar.xz
zsh-248ae0b77eaa416026ccd491d719d5ba543933a8.zip
unposted: tweak to check for openzfs rather than Solaris
-rw-r--r--ChangeLog8
-rw-r--r--Completion/Unix/Command/_zfs2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 87adb1fe9..21812799a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-29  Oliver Kiddle  <okiddle@yahoo.co.uk>
+
+	* 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  <p.stephenson@samsung.com>
 
 	* 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)")