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

diff --git a/modules.d/90kernel-modules/.shchkdir b/modules.d/90kernel-modules/.shchkdir
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/modules.d/90kernel-modules/insmodpost.sh b/modules.d/90kernel-modules/insmodpost.sh
index 4362f0a7548381b0fbc730804c82600d2544f207..a7ab05bdbb3fb173c564902c44a4a71deb9d655f 100755 (executable)
--- a/modules.d/90kernel-modules/insmodpost.sh
+++ b/modules.d/90kernel-modules/insmodpost.sh
@@ -6,7 +6,7 @@ for modlist in $(getargs rd.driver.post -d rdinsmodpost=); do
     (
         IFS=,
         for m in $modlist; do
-            modprobe $m
+            modprobe "$m"
         done
     )
 done

diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index ed52798c1bca095033cf41c438a66f02517ece43..bbafb289a999474d52daaac80eb83e2abdda0dae 100755 (executable)
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -6,22 +6,17 @@ installkernel() {
     local _hostonly_drvs
 
     find_kernel_modules_external() {
-        local _OLDIFS
-        local external_pattern="^/"
+        local a
 
         [[ -f "$srcmods/modules.dep" ]] || return 0
 
-        _OLDIFS=$IFS
-        IFS=:
-        while read a rest; do
-            [[ $a =~ $external_pattern ]] || continue
-            printf "%s\n" "$a"
+        while IFS=: read -r a _ || [[ $a ]]; do
+            [[ $a =~ ^/ ]] && printf "%s\n" "$a"
         done < "$srcmods/modules.dep"
-        IFS=$_OLDIFS
     }
 
     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"
         done
         [[ "$_hostonly_drvs" ]] && return 0
@@ -29,7 +24,7 @@ installkernel() {
     }
 
     install_block_modules_strict() {
-        hostonly='' instmods $_hostonly_drvs
+        hostonly='' instmods "$_hostonly_drvs"
     }
 
     install_block_modules() {
@@ -48,8 +43,7 @@ installkernel() {
             ehci-hcd ehci-pci ehci-platform \
             ohci-hcd ohci-pci \
             uhci-hcd \
-            xhci-hcd xhci-pci xhci-plat-hcd \
-            ${NULL}
+            xhci-hcd xhci-pci xhci-plat-hcd
 
         hostonly=$(optional_hostonly) instmods \
             "=drivers/hid" \
@@ -58,8 +52,7 @@ installkernel() {
             "=drivers/input/keyboard" \
             "=drivers/pci/host" \
             "=drivers/pci/controller" \
-            "=drivers/pinctrl" \
-            ${NULL}
+            "=drivers/pinctrl"
 
         instmods \
             yenta_socket \
@@ -96,8 +89,7 @@ installkernel() {
                 "=drivers/usb/misc" \
                 "=drivers/usb/musb" \
                 "=drivers/usb/phy" \
-                "=drivers/scsi/hisi_sas" \
-                ${NULL}
+                "=drivers/scsi/hisi_sas"
         fi
 
         find_kernel_modules_external | instmods

diff --git a/modules.d/90kernel-modules/parse-kernel.sh b/modules.d/90kernel-modules/parse-kernel.sh
index f1dd72f88e3581c140fa3c384662dc89aad5dcd0..d14f912dff714a2fad4a316c0510295f90cf9669 100755 (executable)
--- a/modules.d/90kernel-modules/parse-kernel.sh
+++ b/modules.d/90kernel-modules/parse-kernel.sh
@@ -13,7 +13,7 @@ for i in $(getargs rd.driver.pre -d rdloaddriver=); do
     (
         IFS=,
         for p in $i; do
-            modprobe $p 2>&1 | vinfo
+            modprobe "$p" 2>&1 | vinfo
         done
     )
 done