90kernel-modules: Don't install extra modules when hostonly mode is set to strict

[thirdparty/dracut.git] / modules.d / 90kernel-modules / module-setup.sh

diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index 40803df8242543654acb9e6a392dec3b68e90e05..89b33ce6deeb48cfe2417c7a125cf59e9b21f914 100755 (executable)
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -2,81 +2,87 @@
 
 # called by dracut
 installkernel() {
-    if [[ -z $drivers ]]; then
-        block_module_filter() {
-            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'
-            # subfunctions inherit following FDs
-            local _merge=8 _side2=9
-            function bmf1() {
-                local _f
-                while read _f || [ -n "$_f" ]; do case "$_f" in
-                    *.ko)    [[ $(<         $_f) =~ $_blockfuncs ]] && echo "$_f" ;;
-                    *.ko.gz) [[ $(gzip -dc <$_f) =~ $_blockfuncs ]] && echo "$_f" ;;
-                    *.ko.xz) [[ $(xz -dc   <$_f) =~ $_blockfuncs ]] && echo "$_f" ;;
-                    esac
-                done
-                return 0
-            }
-            function rotor() {
-                local _f1 _f2
-                while read _f1 || [ -n "$_f1" ]; do
-                    echo "$_f1"
-                    if read _f2; then
-                        echo "$_f2" 1>&${_side2}
-                    fi
-                done | bmf1 1>&${_merge}
-                return 0
-            }
-            # Use two parallel streams to filter alternating modules.
-            set +x
-            eval "( ( rotor ) ${_side2}>&1 | bmf1 ) ${_merge}>&1"
-            [[ $debug ]] && set -x
-            return 0
-        }
+    find_kernel_modules_external () {
+        local _OLDIFS
+        local external_pattern="^/"
+
+        [[ -f "$srcmods/modules.dep" ]] || return 0
+
+        _OLDIFS=$IFS
+        IFS=:
+        while read a rest; do
+            [[ $a =~ $external_pattern ]] || continue
+            printf "%s\n" "$a"
+        done < "$srcmods/modules.dep"
+        IFS=$_OLDIFS
+    }
+    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'
 
+    if [[ -z $drivers ]]; then
         hostonly='' instmods \
             sr_mod sd_mod scsi_dh ata_piix hid_generic unix \
             ehci-hcd ehci-pci ehci-platform \
             ohci-hcd ohci-pci \
             uhci-hcd \
-            xhci-hcd xhci-pci xhci-plat-hcd
+            xhci-hcd xhci-pci xhci-plat-hcd \
+            pinctrl-cherryview \
+            ${NULL}
 
-        instmods \
+        hostonly=$(optional_hostonly) instmods \
             "=drivers/hid" \
+            "=drivers/tty/serial" \
             "=drivers/input/serio" \
-            "=drivers/input/keyboard"
+            "=drivers/input/keyboard" \
+            "=drivers/usb/storage" \
+            "=drivers/pci/host" \
+            ${NULL}
 
-        instmods yenta_socket scsi_dh_rdac scsi_dh_emc scsi_dh_alua \
-                 atkbd i8042 usbhid firewire-ohci pcmcia hv-vmbus
+        instmods \
+            yenta_socket scsi_dh_rdac scsi_dh_emc scsi_dh_alua \
+            atkbd i8042 usbhid firewire-ohci pcmcia hv-vmbus \
+            virtio virtio_blk virtio_ring virtio_pci virtio_scsi \
+            "=drivers/pcmcia" =ide nvme vmd
 
-        if [[ "$(uname -p)" == arm* ]]; then
-            # arm specific modules
+        if [[ "$(uname -m)" == arm* || "$(uname -m)" == aarch64 ]]; then
+            # arm/aarch64 specific modules
+            _blockfuncs+='|dw_mc_probe|dw_mci_pltfm_register'
             instmods \
+                "=drivers/clk" \
+                "=drivers/dma" \
+                "=drivers/extcon" \
+                "=drivers/hwspinlock" \
                 "=drivers/i2c/busses" \
+                "=drivers/mfd" \
+                "=drivers/mmc/core" \
+                "=drivers/phy" \
+                "=drivers/power" \
                 "=drivers/regulator" \
+                "=drivers/rpmsg" \
                 "=drivers/rtc" \
+                "=drivers/soc" \
+                "=drivers/usb/chipidea" \
+                "=drivers/usb/dwc2" \
+                "=drivers/usb/dwc3" \
                 "=drivers/usb/host" \
+                "=drivers/usb/misc" \
+                "=drivers/usb/musb" \
                 "=drivers/usb/phy" \
+                "=drivers/scsi/hisi_sas" \
                 ${NULL}
         fi
 
-        # install virtual machine support
-        instmods virtio virtio_blk virtio_ring virtio_pci virtio_scsi \
-            "=drivers/pcmcia" =ide "=drivers/usb/storage"
+        dracut_instmods -o -s "${_blockfuncs}" "=drivers"
 
-        find_kernel_modules  |  block_module_filter  |  instmods
+        find_kernel_modules_external | instmods
 
         # if not on hostonly mode, install all known filesystems,
         # if the required list is not set via the filesystems variable
         if ! [[ $hostonly ]]; then
             if [[ -z $filesystems ]]; then
-                silent_omit_drivers="kernel/fs/nfs|kernel/fs/nfsd|kernel/fs/lockd" \
-                    instmods '=fs'
+                dracut_instmods -o -P ".*/(kernel/fs/nfs|kernel/fs/nfsd|kernel/fs/lockd)/.*" '=fs'
             fi
-        else
-            for i in $(host_fs_all); do
-                hostonly='' instmods $i
-            done
+        elif [[ "${host_fs_types[*]}" ]]; then
+            hostonly='' instmods "${host_fs_types[@]}"
         fi
     fi
     :