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

[<pa...@us...>]

Revision: 2603
          http://morphix.svn.sourceforge.net/morphix/?rev=2603&view=rev
Author:   paul_c
Date:     2007-12-31 04:05:31 -0800 (Mon, 31 Dec 2007)

Log Message:
-----------
If BLK_DEV_IDECD is set for a module, need cdrom.ko loaded before ide-cd.ko

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	2007-12-05 13:28:11 UTC (rev 2602)
+++ trunk/scripts-base/miniroot/debian/changelog	2007-12-31 12:05:31 UTC (rev 2603)
@@ -1,3 +1,9 @@
+miniroot-morphix (0.1-14) unstable; urgency=low
+
+  * Add cdrom.ko to the list of modules to load.
+
+ -- Paul Corner <pa...@tu...>  Mon, 31 Dec 2007 12:01:57 +0000
+
 miniroot-morphix (0.1-13) unstable; urgency=low
 
   * bumping, fixes from Paul

Modified: trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog
===================================================================
--- trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog	2007-12-05 13:28:11 UTC (rev 2602)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog	2007-12-31 12:05:31 UTC (rev 2603)
@@ -1,3 +1,9 @@
+morphix-miniroot-linuxrc (0.1-9) unstable; urgency=low
+
+  * Add cdrom.ko to the list of modules to load.
+
+ -- Paul Corner <pa...@tu...>  Mon, 31 Dec 2007 12:01:57 +0000
+
 morphix-miniroot-linuxrc (0.1-8) unstable; urgency=low
 
   * fixes from Paul

Modified: trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc
===================================================================
--- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc	2007-12-05 13:28:11 UTC (rev 2602)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc	2007-12-31 12:05:31 UTC (rev 2603)
@@ -155,6 +155,7 @@
 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
 # Use ide-cd for ATAPI-only CD-Rom(s)
 $INSMOD /modules/ide-cd.ko >/dev/null 2>&1

Modified: trunk/scripts-base/miniroot/mkminiroot.sh
===================================================================
--- trunk/scripts-base/miniroot/mkminiroot.sh	2007-12-05 13:28:11 UTC (rev 2602)
+++ trunk/scripts-base/miniroot/mkminiroot.sh	2007-12-31 12:05:31 UTC (rev 2603)
@@ -177,6 +177,7 @@
 cp $BASEDIR/lib/modules/*/kernel/drivers/fs/vfat/vfat.* $DESTDIR/modules/
 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/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


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