More updates in preparation for 3.1

2 files changed, 25 insertions, 8 deletions

diff --git a/initramfs/init b/initramfs/init
index ea2aa57..67ae24b 100755
--- a/initramfs/init
+++ b/initramfs/init
@@ -152,6 +152,18 @@ then
 	DEBUG=1
 fi
 
+grep -q "dshell" /proc/cmdline
+if [ $? -eq 0 ]
+then
+    DSHELL=1
+fi
+
+if [ ! -z "$DSHELL" ]
+then
+    echo "Starting debug shell."
+    /bin/ash
+fi
+
 echo -e -n " ${BOLD}${BLUE}*${NORM} Populating /dev via mdev... "
 mdev -s
 checkReturn
@@ -206,7 +218,7 @@ then
 			gdth hptiop in2000 initio ipr ips lpfc megaraid megaraid_mbox megaraid_sas \
 			nsp32 pas16 psi240i qla1280 qla2xxx qla4xxx qlogicfas qlogicfas408 seagate \
 			sim710 stex sym53c416 sym53c8xx t128 tmscsim u14-34f ultrastor \
-			wd7000 mptsas mptspi hpsa
+			wd7000 mptsas mptspi hpsa hv_storvsc virtio_scsi vmw_pvscsi
 		do
 			if [ ! -z "$DEBUG" ]
 			then
@@ -220,7 +232,7 @@ then
 	# USB
 	load_usb_modules() {
 		echo -e -n "${BOLD}${BLUE}USB${NORM}"
-		for mod in ehci-hcd ohci-hcd uhci-hcd usb-storage usbhid
+		for mod in usb-storage usbhid
 		do
 			if [ ! -z "$DEBUG" ]
 			then
diff --git a/initramfs/initramfs.lst b/initramfs/initramfs.lst
index 10a7fa8..d4170cb 100644
--- a/initramfs/initramfs.lst
+++ b/initramfs/initramfs.lst
@@ -21,6 +21,8 @@ dir /lib/modules/#KERNEL_VERSION# 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/crypto 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers 755 0 0
+dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata 755 0 0
+dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/block 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid/usbhid 755 0 0
@@ -33,7 +35,6 @@ dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/mon 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/serial 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/storage 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/firewire 755 0 0
-dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/ata 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/aacraid 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/aic7xxx 755 0 0
@@ -49,6 +50,8 @@ dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/message 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/message/fusion 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/cdrom 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/base 755 0 0
+dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/hv 755 0 0
+dir /lib/modules/#KERNEL_VERSION#/kernel/drivers/virtio 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/fs 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/fs/isofs 755 0 0
 dir /lib/modules/#KERNEL_VERSION#/kernel/fs/ext2 755 0 0
@@ -73,13 +76,9 @@ file /lib/modules/#KERNEL_VERSION#/modules.dep ../tmp/rootfs/lib/modules/#KERNEL
 
 file /lib/modules/#KERNEL_VERSION#/kernel/crypto/crc32c.ko ../kernel/linux-#KERNEL_VERSION#/crypto/crc32c.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/crypto/xor.ko ../kernel/linux-#KERNEL_VERSION#/crypto/xor.ko 644 0 0
+file /lib/modules/#KERNEL_VERSION#/kernel/drivers/block/virtio_blk.ko ../kernel/linux-#KERNEL_VERSION#/drivers/block/virtio_blk.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/cdrom/cdrom.ko ../kernel/linux-#KERNEL_VERSION#/drivers/cdrom/cdrom.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/usb-common.ko ../kernel/linux-#KERNEL_VERSION#/drivers/usb/usb-common.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/class/cdc-acm.ko ../kernel/linux-#KERNEL_VERSION#/drivers/usb/class/cdc-acm.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/core/usbcore.ko ../kernel/linux-#KERNEL_VERSION#/drivers/usb/core/usbcore.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/host/ehci-hcd.ko ../kernel/linux-#KERNEL_VERSION#/drivers/usb/host/ehci-hcd.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/host/ohci-hcd.ko ../kernel/linux-#KERNEL_VERSION#/drivers/usb/host/ohci-hcd.ko 644 0 0
-file /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/host/uhci-hcd.ko ../kernel/linux-#KERNEL_VERSION#/drivers/usb/host/uhci-hcd.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/storage/usb-storage.ko ../kernel/linux-#KERNEL_VERSION#/drivers/usb/storage/usb-storage.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid/usbhid/usbhid.ko ../kernel/linux-#KERNEL_VERSION#/drivers/hid/usbhid/usbhid.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid/hid.ko ../kernel/linux-#KERNEL_VERSION#/drivers/hid/hid.ko 644 0 0
@@ -166,6 +165,7 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/fdomain.ko ../kernel/linu
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/gdth.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/gdth.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/hpsa.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/hpsa.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/hptiop.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/hptiop.ko 644 0 0
+file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/hv_storvsc.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/hv_storvsc.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/initio.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/initio.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/ipr.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/ipr.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/ips.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/ips.ko 644 0 0
@@ -189,11 +189,16 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/sr_mod.ko ../kernel/linux
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/stex.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/stex.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/sym53c8xx_2/sym53c8xx.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/sym53c8xx_2/sym53c8xx.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/tmscsim.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/tmscsim.ko 644 0 0
+file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/virtio_scsi.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/virtio_scsi.ko 644 0 0
+file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/vmw_pvscsi.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/vmw_pvscsi.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/message/fusion/mptbase.ko ../kernel/linux-#KERNEL_VERSION#/drivers/message/fusion/mptbase.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/message/fusion/mptfc.ko ../kernel/linux-#KERNEL_VERSION#/drivers/message/fusion/mptfc.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/message/fusion/mptsas.ko ../kernel/linux-#KERNEL_VERSION#/drivers/message/fusion/mptsas.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/message/fusion/mptscsih.ko ../kernel/linux-#KERNEL_VERSION#/drivers/message/fusion/mptscsih.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/message/fusion/mptspi.ko ../kernel/linux-#KERNEL_VERSION#/drivers/message/fusion/mptspi.ko 644 0 0
+file /lib/modules/#KERNEL_VERSION#/kernel/drivers/hv/hv_vmbus.ko ../kernel/linux-#KERNEL_VERSION#/drivers/hv/hv_vmbus.ko 644 0 0
+file /lib/modules/#KERNEL_VERSION#/kernel/drivers/virtio/virtio.ko ../kernel/linux-#KERNEL_VERSION#/drivers/virtio/virtio.ko 644 0 0
+file /lib/modules/#KERNEL_VERSION#/kernel/drivers/virtio/virtio_ring.ko ../kernel/linux-#KERNEL_VERSION#/drivers/virtio/virtio_ring.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/fs/isofs/isofs.ko ../kernel/linux-#KERNEL_VERSION#/fs/isofs/isofs.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/fs/ext2/ext2.ko ../kernel/linux-#KERNEL_VERSION#/fs/ext2/ext2.ko 644 0 0
 file /lib/modules/#KERNEL_VERSION#/kernel/fs/ext3/ext3.ko ../kernel/linux-#KERNEL_VERSION#/fs/ext3/ext3.ko 644 0 0