kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(kernel-modules-extra): shellcheck for modules.d/90kernel-modules-extra

master
Harald Hoyer 2021-03-26 10:29:20 +01:00 committed by Harald Hoyer
parent a26e12cefc
commit 27f5e75893
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
modules.d/90kernel-modules-extra/.shchkdir Normal file
View File

23
modules.d/90kernel-modules-extra/module-setup.sh
View File

@ -38,7 +38,6 @@ installkernel() {
printf "%s" "$1" | sed 's/\([.+?^$\/\\|()\[]\|\]\)/\\\0/' printf "%s" "$1" | sed 's/\([.+?^$\/\\|()\[]\|\]\)/\\\0/'
} }


local OLDIFS
local cfg local cfg
local cfgs=() local cfgs=()
local search_list="" local search_list=""
@ -49,7 +48,7 @@ installkernel() {
## Gathering and sorting configuration file list ## Gathering and sorting configuration file list


[ -n "${depmod_configs[*]-}" ] \ [ -n "${depmod_configs[*]-}" ] \
|| depmod_configs=(/run/depmod.d/ /etc/depmod.d/ /lib/depmod.d/) || depmod_configs=(/run/depmod.d /etc/depmod.d /lib/depmod.d)


for cfg in "${depmod_configs[@]}"; do for cfg in "${depmod_configs[@]}"; do
[ -e "$cfg" ] || { [ -e "$cfg" ] || {
@ -60,25 +59,23 @@ installkernel() {
# '/' is used as a separator between configuration name and # '/' is used as a separator between configuration name and
# configuration path # configuration path
if [ -d "$cfg" ]; then if [ -d "$cfg" ]; then
for f in "$cfg/"*; do for f in "$cfg/"*.conf; do
[[ -e $f && ! -d $f ]] || { [[ -e $f && ! -d $f ]] || {
prdebug "configuration source" \ prdebug "configuration source" \
"\"$cfg\" is ignored" \ "\"$cfg\" is ignored" \
"(directory or doesn't exist)" "(directory or doesn't exist)"
continue continue
} }
cfgs+=("$(basename "$f")/$f") cfgs+=("${f##*/}/$f")
done done
else else
cfgs+=("$(basename "$cfg")/$cfg") cfgs+=("${cfg##*/}/$cfg")
fi fi
done done


OLDIFS="$IFS" if ((${#cfgs[@]} > 0)); then
IFS=$'\n' mapfile -t cfgs < <(printf '%s\n' "${cfgs[@]}" | LANG=C sort -u -k1,1 -t '/' | cut -f 2- -d '/')
LANG=C cfgs=($(printf '%s\n' "${cfgs[@]}" \ fi
| sort -u -k1,1 -t '/' | cut -f 2- -d '/'))
IFS="$OLDIFS"


## Parse configurations ## Parse configurations


@ -160,9 +157,9 @@ installkernel() {


for f in $(printf "%s" "$search_list"); do for f in $(printf "%s" "$search_list"); do
# Ignoring builtin modules # Ignoring builtin modules
[ "built-in" != "$f" ] || continue [[ $f == "built-in" ]] && continue


if [ "external" = "$f" ]; then if [[ $f == "external" ]]; then
for e in "${external_dirs[@]}"; do for e in "${external_dirs[@]}"; do
pathlist+=("$(re_escape "${e%/}")/[^:]+") pathlist+=("$(re_escape "${e%/}")/[^:]+")
done done
@ -174,7 +171,7 @@ installkernel() {
## Filter modules.dep, canonicalise the resulting filenames and supply ## Filter modules.dep, canonicalise the resulting filenames and supply
## them to instmods. ## them to instmods.


[ 0 -lt "${#pathlist[@]}" ] || return 0 ((${#pathlist[@]} > 0)) || return 0


printf "^%s\.ko(\.gz|\.bz2|\.xz)?:\n" "${pathlist[@]}" \ printf "^%s\.ko(\.gz|\.bz2|\.xz)?:\n" "${pathlist[@]}" \
| (LANG=C grep -E -o -f - -- "$depmod_modules_dep" || exit 0) \ | (LANG=C grep -E -o -f - -- "$depmod_modules_dep" || exit 0) \