From 4527d0dfff47851fa3e54b2f56797a276190b78e Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Thu, 29 Jan 2009 17:14:53 +0000 Subject: Jörg Sommer: 26451: use globbing to find available modules, now that modprobe -l is deprecated. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 5 ++++- Completion/Linux/Command/_modutils | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2b8d98ad..71d3f4e6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ * 26483: Completion/Unix/Command/_getfacl, Completion/Unix/Command/_setfacl: handle SGI's acl programs as well as Cygwin's. + * Jörg Sommer: 26451: Completion/Linux/Command/_modutils: use + globbing to find available modules, now that modprobe -l is + deprecated. 2009-01-29 Peter Stephenson @@ -11038,5 +11041,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4533 $ +* $Revision: 1.4534 $ ***************************************************** diff --git a/Completion/Linux/Command/_modutils b/Completion/Linux/Command/_modutils index eefb11f2a..828926dfb 100644 --- a/Completion/Linux/Command/_modutils +++ b/Completion/Linux/Command/_modutils @@ -78,7 +78,7 @@ case "$state" in ;& all_modules) - modules=( ${${${${(f)"$(_call_program modules ${(M)words[1]##*/}modprobe -l 2>/dev/null)"}:#}##*/}%%.*} ) + modules=( /lib/modules/$(uname -r)/(*~source)/**/*(.:t:r) ) if [[ $state = loadable_modules ]]; then modules=( ${modules:#(${(j:|:)~${=loaded_modules//_/-}})} ) -- cgit 1.4.1