Skip to content

Commit f0d0af1

Browse files
nabijaczlewelinicman23
authored andcommitted
contrib/bash_completion.d: fix error spew from __zfs_match_snapshot()
Given: /sbin/zfs list filling/a-zvol<TAB> -o space,refratio The rest of the cmdline gets vored by: /sbin/zfs list filling/a-zvolcannot open 'filling/a-zvol': operation not applicable to datasets of this type With -x (fragment): + COMPREPLY=($(compgen -W "$(__zfs_match_snapshot)" -- "$cur")) +++ __zfs_match_snapshot +++ local base_dataset=filling/dziadtop-nowe-duchy +++ [[ filling/dziadtop-nowe-duchy != filling/dziadtop-nowe-duchy ]] +++ [[ filling/dziadtop-nowe-duchy != '' ]] +++ __zfs_list_datasets filling/dziadtop-nowe-duchy +++ /sbin/zfs list -H -o name -s name -t filesystem -r filling/dziadtop-nowe-duchy +++ tail -n +2 cannot open 'filling/dziadtop-nowe-duchy': operation not applicable to datasets of this type +++ echo filling/dziadtop-nowe-duchy +++ echo filling/dziadtop-nowe-duchy@ ++ compgen -W 'filling/dziadtop-nowe-duchy This properly completes with: $ /sbin/zfs list filling/a-zvol<TAB> -o space,refratio filling/a-zvol filling/a-zvol@ $ /sbin/zfs list filling/a-zvol<cursor> -o space,refratio Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#12820
1 parent cce8803 commit f0d0af1

File tree

1 file changed

+1
-1
lines changed
  • contrib/bash_completion.d

1 file changed

+1
-1
lines changed

contrib/bash_completion.d/zfs.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ __zfs_match_snapshot()
6969
else
7070
if [ "$cur" != "" ] && __zfs_list_datasets "$cur" &> /dev/null
7171
then
72-
$__ZFS_CMD list -H -o name -s name -t filesystem -r "$cur" | tail -n +2
72+
$__ZFS_CMD list -H -o name -s name -t filesystem,volume -r "$cur" | tail -n +2
7373
# We output the base dataset name even though we might be
7474
# completing a command that can only take a snapshot, because it
7575
# prevents bash from considering the completion finished when it

0 commit comments

Comments
 (0)