Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

contrib: link zpool to zfs in bash-completion (#16376) 

Currently user won't have completion of `zpool` command until they
trigger completion of `zfs` first. This patch adds a link to `zfs`,
thus user can use both to initialize the completion.

Fixes: #16320

Signed-off-by: Shengqi Chen <harry-chen@outlook.com>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Rob Norris <rob.norris@klarasystems.com>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
This commit is contained in:
Shengqi Chen 2024-08-06 00:44:10 +08:00 committed by Tony Hutter
parent 2ca1515374
commit a99a37991e
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/bash_completion.d/.gitignore vendored
View File

@ -1 +1,2 @@
/zfs /zfs
/zpool

12
contrib/bash_completion.d/Makefile.am
View File

@ -1,5 +1,9 @@
nodist_bashcompletion_DATA = %D%/zfs nodist_bashcompletion_DATA = %D%/zfs %D%/zpool
SUBSTFILES += $(nodist_bashcompletion_DATA) COMPLETION_FILES = %D%/zfs
SUBSTFILES += $(COMPLETION_FILES)
SHELLCHECKSCRIPTS += $(nodist_bashcompletion_DATA) SHELLCHECKSCRIPTS += $(COMPLETION_FILES)
$(call SHELLCHECK_OPTS,$(nodist_bashcompletion_DATA)): SHELLCHECK_SHELL = bash $(call SHELLCHECK_OPTS,$(COMPLETION_FILES)): SHELLCHECK_SHELL = bash
%D%/zpool: %D%/zfs
$(LN_S) zfs $@

1
rpm/generic/zfs.spec.in
View File

@ -532,6 +532,7 @@ systemctl --system daemon-reload >/dev/null || true
%attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/* %attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/*
%config(noreplace) %{_bashcompletiondir}/zfs %config(noreplace) %{_bashcompletiondir}/zfs
%config(noreplace) %{_bashcompletiondir}/zpool
%files -n libzpool5 %files -n libzpool5
%{_libdir}/libzpool.so.* %{_libdir}/libzpool.so.*