From 6f6cdea2b3a587604541dcc459aa326d6ff93152 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Mon, 29 Sep 2025 14:32:10 +0200 Subject: 53970 based on github #131 by Christopher Bock: complete all dataset properties for zfs allow and support comma separated list for zfs scripts --- Completion/Unix/Command/_zfs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Completion/Unix/Command') diff --git a/Completion/Unix/Command/_zfs b/Completion/Unix/Command/_zfs index ef4b80a41..cfbb3db4d 100644 --- a/Completion/Unix/Command/_zfs +++ b/Completion/Unix/Command/_zfs @@ -300,12 +300,6 @@ case $OSTYPE in ;; esac -delegatable_perms+=( - allow clone create destroy diff hold key keychange mount promote receive - release rename rollback send share snapshot groupquota groupused userprop - userused ${ci_ds_props%%:*} -) - key_properties=( 'keylocation:location [prompt]:_files -P file\:// -W /' 'keyformat:format:(raw hex passphrase)' @@ -316,6 +310,12 @@ ro_ds_props+=( $share_ro_properties ) rw_ds_props+=( $share_rw_properties ) ci_ds_props+=( $rw_ds_props ) +delegatable_perms+=( + allow clone create destroy diff hold key keychange mount promote receive + release rename rollback send share snapshot groupquota groupused userprop + userused ${ci_ds_props%%:*} +) + ds_propnames=( ${rw_ds_props%%:*} ) po_propnames=( ${ro_po_props%%:*} ${ci_po_props%%:*} ${rw_po_props%%:*} ) @@ -1080,7 +1080,7 @@ case $service:$words[1] in zpool:iostat) if [[ $implementation = openzfs ]]; then args=( - '-c[run scripts on each vdev]:script:_files -W "($ZPOOL_SCRIPTS_PATH /etc/zfs/zpool.d ~/.zpool.d)"' + '-c+[run scripts on each vdev]:script:_sequence _files -W "($ZPOOL_SCRIPTS_PATH /etc/zfs/zpool.d ~/.zpool.d)"' '-g[display vdev GUIDs instead of normal device names]' '-H[suppress headers and tab-delimit fields]' '-L[display real paths for vdevs resolving all symbolic links]' @@ -1249,7 +1249,7 @@ case $service:$words[1] in args=( '--power[display vdev enclosure slot power status]' '-D[display a histogram of deduplication statistics]' - '-c[run scripts on each vdev]:script:_files -W "($ZPOOL_SCRIPTS_PATH /etc/zfs/zpool.d ~/.zpool.d)"' + '-c+[run scripts on each vdev]:script:_sequence _files -W "($ZPOOL_SCRIPTS_PATH /etc/zfs/zpool.d ~/.zpool.d)"' '-e[only show unhealthy vdevs]' '-i[display vdev initialization status]' '-g[display vdev GUIDs instead of the normal device names]' -- cgit v1.2.3-70-g09d2