Browse Source

Improved initramfs device drivers coverage

This fixes issues such as not detecting USB drives as USB 2.0,
and later "losing" the device later during the boot process.
Maxim Kammerer 12 years ago
parent
commit
cae8590201
3 changed files with 31 additions and 35 deletions
  1. 1 1
      src/root/helpers/gen-initramfs
  2. 1 29
      src/root/initrd/modules.extra
  3. 29 5
      src/root/initrd/modules.global

+ 1 - 1
src/root/helpers/gen-initramfs

@@ -27,7 +27,7 @@ image=/usr/local/addons/initrd/initrd-x86.cpio
 extmods=`sed -n '/^[^#]/p' ${extralst}`
 globmods=
 for globmod in `sed -n '/^[^#]/p' ${globlst}`; do
-    globmods="${globmods} "`find /lib/modules/${kversion}/kernel/drivers/${globmod} \
+    globmods="${globmods} "`find /lib/modules/${kversion}/kernel/${globmod} \
                                  -name '*.ko' -printf '%f\n' | sed 's/\.ko$//'`
 done
 

+ 1 - 29
src/root/initrd/modules.extra

@@ -1,35 +1,7 @@
-# Filesystem modules
+# Loop devices
 loop
-squashfs
 
-vfat
-isofs
-ext4
-hfsplus
-
-nls_cp437
-nls_iso8859-1
-nls_utf8
-
-
-# USB input devices
-usbhid
-
-
-# USB storage devices
-usb-storage
-xhci-hcd
-ehci-hcd
-uhci-hcd
-ohci-hcd
 
 # Virtio storage (e.g., QEMU)
 virtio_pci
 virtio_blk
-
-# SD/MMC cards
-mmc_block
-
-# PCMCIA-attached storage
-yenta_socket
-pcmcia

+ 29 - 5
src/root/initrd/modules.global

@@ -1,8 +1,32 @@
-# User may want to boot from a PATA/SATA hard disk
-ata
+# USB 1.1/2/3/W hosts and storage devices
+drivers/usb/host
+drivers/usb/storage
 
-# This includes CDROM support
-scsi
+# SD/MMC hosts and cards
+drivers/mmc/host
+drivers/mmc/card
+
+# Support booting from a PATA/SATA hard disk
+drivers/ata
+
+# SCSI includes CDROM and VM disks support
+drivers/scsi
 
 # Fusion MPT (e.g., for newer VMWare LSI Logic SCSI controller)
-message/fusion
+drivers/message/fusion
+
+# PCMCIA-attached storage
+drivers/pcmcia
+
+
+# USB input devices
+drivers/hid/usbhid
+
+
+# Filesystem modules
+fs/squashfs
+fs/fat
+fs/isofs
+fs/ext4
+fs/hfsplus
+fs/nls