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): shellcheck regression 

`$_hostonly_drvs` contained multiple arguments and was quoted.

This patch converts `_hostonly_drvs` into an associative array, which
enables easy deduplication and proper quoting in bash.

Fixes: https://github.com/dracutdevs/dracut/issues/1276
master
Harald Hoyer 2021-03-31 10:01:18 +02:00 committed by Harald Hoyer
parent 7b8c78ff43
commit 1dc61299f7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
# called by dracut # called by dracut
installkernel() { installkernel() {
local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_add_host|scsi_add_host_with_dma' local _blockfuncs='ahci_platform_get_resources|ata_scsi_ioctl|scsi_add_host|blk_cleanup_queue|register_mtd_blktrans|scsi_esp_register|register_virtio_device|usb_stor_disconnect|mmc_add_host|sdhci_add_host|scsi_add_host_with_dma'
local _hostonly_drvs local -A _hostonly_drvs


find_kernel_modules_external() { find_kernel_modules_external() {
local a local a
@ -17,14 +17,14 @@ installkernel() {


record_block_dev_drv() { record_block_dev_drv() {
for _mod in $(get_dev_module /dev/block/"$1"); do for _mod in $(get_dev_module /dev/block/"$1"); do
[[ " $_hostonly_drvs " != *$_mod* ]] && _hostonly_drvs+=" $_mod" _hostonly_drvs["$_mod"]="$_mod"
done done
[[ "$_hostonly_drvs" ]] && return 0 ((${#_hostonly_drvs[@]} > 0)) && return 0
return 1 return 1
} }


install_block_modules_strict() { install_block_modules_strict() {
hostonly='' instmods "$_hostonly_drvs" hostonly='' instmods "${_hostonly_drvs[@]}"
} }


install_block_modules() { install_block_modules() {