Skip to content

Commit 6f6cdea

Browse files
author
Oliver Kiddle
committed
53970 based on github #131 by Christopher Bock: complete all dataset properties for zfs allow and support comma separated list for zfs scripts
1 parent 89c0256 commit 6f6cdea

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
2025-09-29 Oliver Kiddle <[email protected]>
22

3+
* 53970 based on github #131 by Christopher Bock:
4+
Completion/Unix/Command/_zfs: complete all dataset properties
5+
for zfs allow and support comma separated list for zfs scripts
6+
37
* 53969: Completion/Unix/Command/_date,
48
Completion/Unix/Command/_env, Completion/Unix/Command/_ping:
59
completion updates for Unix utilities in macOS 15.5

Completion/Unix/Command/_zfs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,6 @@ case $OSTYPE in
300300
;;
301301
esac
302302

303-
delegatable_perms+=(
304-
allow clone create destroy diff hold key keychange mount promote receive
305-
release rename rollback send share snapshot groupquota groupused userprop
306-
userused ${ci_ds_props%%:*}
307-
)
308-
309303
key_properties=(
310304
'keylocation:location [prompt]:_files -P file\:// -W /'
311305
'keyformat:format:(raw hex passphrase)'
@@ -316,6 +310,12 @@ ro_ds_props+=( $share_ro_properties )
316310
rw_ds_props+=( $share_rw_properties )
317311
ci_ds_props+=( $rw_ds_props )
318312

313+
delegatable_perms+=(
314+
allow clone create destroy diff hold key keychange mount promote receive
315+
release rename rollback send share snapshot groupquota groupused userprop
316+
userused ${ci_ds_props%%:*}
317+
)
318+
319319
ds_propnames=( ${rw_ds_props%%:*} )
320320
po_propnames=( ${ro_po_props%%:*} ${ci_po_props%%:*} ${rw_po_props%%:*} )
321321

@@ -1080,7 +1080,7 @@ case $service:$words[1] in
10801080
zpool:iostat)
10811081
if [[ $implementation = openzfs ]]; then
10821082
args=(
1083-
'-c[run scripts on each vdev]:script:_files -W "($ZPOOL_SCRIPTS_PATH /etc/zfs/zpool.d ~/.zpool.d)"'
1083+
'-c+[run scripts on each vdev]:script:_sequence _files -W "($ZPOOL_SCRIPTS_PATH /etc/zfs/zpool.d ~/.zpool.d)"'
10841084
'-g[display vdev GUIDs instead of normal device names]'
10851085
'-H[suppress headers and tab-delimit fields]'
10861086
'-L[display real paths for vdevs resolving all symbolic links]'
@@ -1249,7 +1249,7 @@ case $service:$words[1] in
12491249
args=(
12501250
'--power[display vdev enclosure slot power status]'
12511251
'-D[display a histogram of deduplication statistics]'
1252-
'-c[run scripts on each vdev]:script:_files -W "($ZPOOL_SCRIPTS_PATH /etc/zfs/zpool.d ~/.zpool.d)"'
1252+
'-c+[run scripts on each vdev]:script:_sequence _files -W "($ZPOOL_SCRIPTS_PATH /etc/zfs/zpool.d ~/.zpool.d)"'
12531253
'-e[only show unhealthy vdevs]'
12541254
'-i[display vdev initialization status]'
12551255
'-g[display vdev GUIDs instead of the normal device names]'

0 commit comments

Comments
 (0)