From: Kairui Song <kasong@redhat.com>
Date: Tue, 20 Oct 2020 09:30:03 +0000 (+0800)
Subject: 90kernel-modules: Install less modules for hostonly mode
X-Git-Tag: 051~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5817934936e4656034328ad475b884f5ecf8bd45;p=thirdparty%2Fdracut.git

90kernel-modules: Install less modules for hostonly mode

Rearrange some module installation mode, install less modules for
hostonly mode.

Signed-off-by: Kairui Song <kasong@redhat.com>
---

diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index 73df29bf5..49609855e 100755
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -35,8 +35,9 @@ installkernel() {
     install_block_modules () {
         instmods \
             scsi_dh_rdac scsi_dh_emc scsi_dh_alua \
+            =drivers/usb/storage \
             =ide nvme vmd \
-            virtio_blk
+            virtio_blk virtio_scsi
 
         dracut_instmods -o -s "${_blockfuncs}" "=drivers"
     }
@@ -48,7 +49,6 @@ installkernel() {
             ohci-hcd ohci-pci \
             uhci-hcd \
             xhci-hcd xhci-pci xhci-plat-hcd \
-            "=drivers/pinctrl" \
             ${NULL}
 
         hostonly=$(optional_hostonly) instmods \
@@ -56,15 +56,15 @@ installkernel() {
             "=drivers/tty/serial" \
             "=drivers/input/serio" \
             "=drivers/input/keyboard" \
-            "=drivers/usb/storage" \
             "=drivers/pci/host" \
             "=drivers/pci/controller" \
+            "=drivers/pinctrl" \
             ${NULL}
 
         instmods \
             yenta_socket \
             atkbd i8042 usbhid firewire-ohci pcmcia hv-vmbus \
-            virtio virtio_ring virtio_pci virtio_scsi pci_hyperv \
+            virtio virtio_ring virtio_pci pci_hyperv \
             "=drivers/pcmcia"
 
         if [[ "${DRACUT_ARCH:-$(uname -m)}" == arm* || "${DRACUT_ARCH:-$(uname -m)}" == aarch64 ]]; then