mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-27 22:40:20 +02:00
Code

gitlab !15: modutils completion: Fix FHS assumption

Browse Source 
Remove calls to programs from /sbin/ with _call_program and to avoid the
system complies to the FHS.
Support modules completion for NixOS and Guix which store their kernel
modules not at /lib/modules.
This commit is contained in:
Doron Behar 2020-05-31 14:51:33 +03:00 committed by Oliver Kiddle
parent 57a735f6b9
commit 02f62e5d21
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2020-07-08 Oliver Kiddle <okiddle@yahoo.co.uk>
* gitlab !15: Doron Behar: Completion/Linux/Command/_modutils:
Fix FHS assumption
* 46201 (tweaked per Daniel): Etc/completion-style-guide: add
guidelines for caching and use of imperative mood in descriptions

23
Completion/Linux/Command/_modutils
View File

@ -12,7 +12,19 @@ _modules_caching_policy()
_modutils() {
local curcontext="$curcontext" expl state line modules modaliases ign args ret=1
local -A opt_args
local -r modules_dir=/lib/modules
local -a possible_modules_dirs=(
# Mostly every other distro
/lib/modules
# NixOS & possibly Guix
/run/booted-system/kernel-modules/lib/modules
)
local modules_dir tested_modules_dir
for tested_modules_dir in "${possible_modules_dirs[@]}"; do
if [[ -d "$tested_modules_dir" ]]; then
modules_dir="$tested_modules_dir"
break
fi
done
local update_policy
zstyle -s ":completion:*:*:$service:*" cache-policy update_policy
@ -93,8 +105,10 @@ _modutils() {
loaded-modules|loadable-modules)
if [[ -r /proc/modules ]]; then
loaded_modules=(${${(f)"$(</proc/modules)"}%% *})
# For compatibilty with old systems. Kernels nowadays provide
# `/proc/modules` which is more reliable and faster for us.
elif [[ -x /sbin/lsmod ]]; then
loaded_modules=(${${(f)"$(/sbin/lsmod)"}[2,-1]%% *})
loaded_modules=(${${(f)"$(_call_program loaded-modules /sbin/lsmod)"}[2,-1]%% *})
else
return 1
fi
@ -108,6 +122,9 @@ _modutils() {
all-modules)
local kver=${(v)opt_args[(i)(-S|-k|--set-version)]:-$(uname -r)}
if [[ -z "$modules_dir" ]]; then
return
fi
if _cache_invalid modules-$kver || ! _retrieve_cache modules-$kver;
then
modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz|ko.xz)(.:t:r:r) )
@ -137,7 +154,7 @@ _modutils() {
_message -e value 'parameter value'
else
local params
params=( ${${(M)${(f)"$(_call_program module-parameters /sbin/modinfo "$words[2]" 2>/dev/null)"}:#parm:*}##parm:[[:space:]]##} )
params=( ${${(M)${(f)"$(_call_program module-parameters modinfo "$words[2]" 2>/dev/null)"}:#parm:*}##parm:[[:space:]]##} )
compset -S '=*'
if (( $#params )); then
_values -S = -w 'module parameter' \