[Morphix-cvs] SF.net SVN: morphix: [2609] trunk/scripts-base/miniroot

[<ale...@us...>]

Revision: 2609
          http://morphix.svn.sourceforge.net/morphix/?rev=2609&view=rev
Author:   alextreme
Date:     2008-01-27 06:52:06 -0800 (Sun, 27 Jan 2008)

Log Message:
-----------
 * adding sd_mod (in case of module) to miniroot
 * add loading of scsi_mod and sd_mod in case of usb-booting
 * These issues were submitted by Markus Mandalka

Modified Paths:
--------------
    trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc
    trunk/scripts-base/miniroot/mkminiroot.sh

Modified: trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc
===================================================================
--- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc	2008-01-17 16:00:34 UTC (rev 2608)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc	2008-01-27 14:52:06 UTC (rev 2609)
@@ -234,6 +234,7 @@
 # load usb-modules first (so that memory-stick becomes /dev/sda1)
     echo "6" > /proc/sys/kernel/printk
 
+    $INSMOD -f /modules/usb/scsi_mod$KEXT  >/dev/null
     $INSMOD -f /modules/usb/usbcore$KEXT >/dev/null
     FOUNDUSB=""
     if test -n "$USBBOOT2"
@@ -245,6 +246,7 @@
 	$INSMOD -f /modules/usb/uhci-hcd$KEXT >/dev/null && FOUNDUSB="yes"
 	$INSMOD -f /modules/usb/ohci-hcd$KEXT >/dev/null && FOUNDUSB="yes"
     fi
+    $INSMOD -f /modules/usb/sd_mod$KEXT  >/dev/null
     $INSMOD -f /modules/usb/usb-storage$KEXT  >/dev/null
 
     # wait 5 seconds for usb device to be registered

Modified: trunk/scripts-base/miniroot/mkminiroot.sh
===================================================================
--- trunk/scripts-base/miniroot/mkminiroot.sh	2008-01-17 16:00:34 UTC (rev 2608)
+++ trunk/scripts-base/miniroot/mkminiroot.sh	2008-01-27 14:52:06 UTC (rev 2609)
@@ -180,7 +180,7 @@
 cp $BASEDIR/lib/modules/*/kernel/drivers/cdrom/cdrom.* $DESTDIR/modules/
 cp $BASEDIR/lib/modules/*/kernel/drivers/ide/ide-cd.* $DESTDIR/modules/
 cp $BASEDIR/lib/modules/*/kernel/drivers/scsi/{3w-xxxx.*,BusLogic.*,NCR53c406a.*,a100u2w.*,advansys.*,aha152x.*,aha1542.*,aic7xxx/aic7xxx.*,atp870u.*,dtc.*,eata.*,fdomain.*,gdth.*,initio.*,megaraid.*,pas16.*,psi240i.*,qlogicfas.*,qlogicfc.*,seagate.*,t128.*,tmscsim.*,u14-34f.*,ultrastor.*,wd7000.*} $DESTDIR/modules/scsi
-cp $BASEDIR/lib/modules/*/kernel/drivers/scsi/{scsi_transport_spi.*,scsi_mod.*,qlogicfas408.*} $DESTDIR/modules/scsi
+cp $BASEDIR/lib/modules/*/kernel/drivers/scsi/{scsi_transport_spi.*,scsi_mod.*,qlogicfas408.*,sd_mod.*} $DESTDIR/modules/scsi
 cp $BASEDIR/lib/modules/*/kernel/drivers/usb/{core/usbcore.*,host/ehci-hcd.*,host/ohci-hcd.*,host/uhci-hcd.*,storage/usb-storage.*} $DESTDIR/modules/usb
 
 ln -s /MorphixCD/opt $DESTDIR/opt # is this one necessary?


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.