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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2638
          http://morphix.svn.sourceforge.net/morphix/?rev=2638&view=rev
Author:   paul_c
Date:     2009-01-16 21:33:53 +0000 (Fri, 16 Jan 2009)

Log Message:
-----------
Include SATA and PATA modules to the increasing list of "stuff" in the miniroot.
Also add USB keyboard driver, as some people refuse to attach PS/2 keyboards
(and if miniroot barfs before loading a mainmod, no chance to do any diagnostics).
.
.

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

Modified: trunk/scripts-base/miniroot/debian/changelog
===================================================================

--- trunk/scripts-base/miniroot/debian/changelog	2009-01-15 23:20:05 UTC (rev 2637)
+++ trunk/scripts-base/miniroot/debian/changelog	2009-01-16 21:33:53 UTC (rev 2638)
@@ -1,3 +1,10 @@
+miniroot-morphix (0.1-18) unstable; urgency=low
+
+  * Add [P|S]ATA modules to the growing list of stuff
+  * Increased usage of USB keyboards, should also have driver.
+
+ -- Paul Corner <pa...@tu...>  Fri, 16 Jan 2009 21:24:22 +0000
+
 miniroot-morphix (0.1-17) unstable; urgency=low
 
   * Changes to get USB/SCSI devices working again

Modified: trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog
===================================================================
--- trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog	2009-01-15 23:20:05 UTC (rev 2637)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog	2009-01-16 21:33:53 UTC (rev 2638)
@@ -1,3 +1,11 @@
+morphix-miniroot-linuxrc (0.1-12) unstable; urgency=low
+
+  * SATA modules included.
+  * Also attempts to load usbkbd driver
+    (not everyone has a PS/2 keyboard now).
+
+ -- Paul Corner <pa...@tu...>  Fri, 16 Jan 2009 21:22:14 +0000
+
 morphix-miniroot-linuxrc (0.1-11) unstable; urgency=low
 
   * Fixes for USB/SCSI booting

Modified: trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc
===================================================================
--- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc	2009-01-15 23:20:05 UTC (rev 2637)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc	2009-01-16 21:33:53 UTC (rev 2638)
@@ -39,6 +39,14 @@
 seagate$KEXT t128$KEXT tmscsim$KEXT u14-34f$KEXT ultrastor$KEXT wd7000$KEXT \
 a100u2w$KEXT 3w-xxxx$KEXT"
 
+SATA_MODULES="libata$KEXT sata_inic162x$KEXT sata_mv$KEXT sata_nv$KEXT \
+sata_promise$KEXT sata_qstor$KEXT sata_sil24$KEXT \
+sata_sil$KEXT sata_sis$KEXT sata_svw$KEXT sata_sx4$KEXT \
+sata_uli$KEXT sata_via$KEXT sata_vsc$KEXT"
+
+PATA_MODULES="ahci$KEXT ata_generic$KEXT ata_piix$KEXT
+pata_marvell$KEXT pata_sis$KEXT pdc_adma$KEXT"
+
 # Misc functions
 INSMOD="insmod"
 /static/[ -x /static/insmod ] && INSMOD="/static/insmod"
@@ -155,12 +163,12 @@
 echo "0" > /proc/sys/kernel/printk
 
 # Check for IDE-SCSI capable CD-Rom(s) first
-$INSMOD /modules/cdrom.ko >/dev/null 2>&1
-$INSMOD /modules/ide-scsi.ko >/dev/null 2>&1
+$INSMOD /modules/cdrom$KEXT >/dev/null 2>&1
+$INSMOD /modules/ide-scsi$KEXT >/dev/null 2>&1
 # Use ide-cd for ATAPI-only CD-Rom(s)
-$INSMOD /modules/ide-cd.ko >/dev/null 2>&1
-$INSMOD /modules/fs/jbd/jbd.ko >/dev/null 2>&1
-$INSMOD /modules/fs/ext3/ext3.ko >/dev/null 2>&1
+$INSMOD /modules/ide-cd$KEXT >/dev/null 2>&1
+$INSMOD /modules/fs/jbd/jbd$KEXT >/dev/null 2>&1
+$INSMOD /modules/fs/ext3/ext3$KEXT >/dev/null 2>&1
 
 # Mount module disk
 mountmodules(){
@@ -236,6 +244,8 @@
 $INSMOD -f /modules/usb/ohci-hcd$KEXT >/dev/null
 $INSMOD -f /modules/scsi/sd_mod$KEXT  >/dev/null
 $INSMOD -f /modules/usb/usb-storage$KEXT  >/dev/null
+# Load the USB keyboard driver *just* in case..
+$INSMOD -f /modules/usb/usbkbd$KEXT  >/dev/null
 
 # Wait for devices to be registered
 sleep 2
@@ -270,8 +280,8 @@
 # Let the user select interactively
 askmodules SCSI $(cd /modules/scsi; echo *$KEXT)
 else
-# these are the autoprobe-safe modules
-MODULES="$SCSI_MODULES"
+# these are the autoprobe-safe modules (SATA modules *might not be).
+MODULES="$SCSI_MODULES $SATA_MODULES"
 fi
 test -z "$NOSCSI" && test -n "$MODULES" && loadmodules SCSI $MODULES
 # End of SCSI check
@@ -311,6 +321,7 @@
 DEVICES="/dev/hd?"
 test -n "$FOUND_SCSI" -a -z "$NOCD" && DEVICES="/dev/scd? /dev/scd?? $DEVICES"
 DEVICES="$DEVICES /dev/pcd?"
+DEVICES="$DEVICES /dev/sg[0-9] /dev/sr[0-9]"
 DEVICES="$DEVICES /dev/sd?[1-9] /dev/sd?[1-9][0-9]"
 DEVICES="$DEVICES /dev/hd?[1-9] /dev/hd?[1-9][0-9]"
 DEVICES="/dev/scd? /dev/scd?? $DEVICES"

Modified: trunk/scripts-base/miniroot/mkminiroot.sh
===================================================================
--- trunk/scripts-base/miniroot/mkminiroot.sh	2009-01-15 23:20:05 UTC (rev 2637)
+++ trunk/scripts-base/miniroot/mkminiroot.sh	2009-01-16 21:33:53 UTC (rev 2638)
@@ -178,10 +178,12 @@
 cp $BASEDIR/lib/modules/*/kernel/drivers/block/cloop.* $DESTDIR/modules/
 cp $BASEDIR/lib/modules/*/extra/cloop.* $DESTDIR/modules/
 cp $BASEDIR/lib/modules/*/kernel/drivers/cdrom/cdrom.* $DESTDIR/modules/
+cp $BASEDIR/lib/modules/*/kernel/drivers/ata/*.* $DESTDIR/modules/scsi
 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.*,sd_mod.*,sg.*,sr_mod.*,st.*} $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
+cp $BASEDIR/lib/modules/*/kernel/drivers/hid/usbhid/usbkbd.* $DESTDIR/modules/usb
 
 ln -s /MorphixCD/opt $DESTDIR/opt # is this one necessary?
 
@@ -189,7 +191,7 @@
 
 ln -s /MorphixCD/sbin $DESTDIR/sbin
 
-mkdir $DESTDIR/static # place staticly compiled binaries in here (ash, splash)
+mkdir $DESTDIR/static # place statically compiled binaries in here (ash, splash)
 
 #ln -s ash $DESTDIR/static/init
 #ln -s ash $DESTDIR/static/sh


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


