Menu
▾
▴
morphix-cvs
|
From: <pa...@us...> - 2007-05-22 15:36:08
|
Revision: 2493
http://svn.sourceforge.net/morphix/?rev=2493&view=rev
Author: paul_c
Date: 2007-05-22 08:34:42 -0700 (Tue, 22 May 2007)
Log Message:
-----------
Include scsi_transport and scsi_mod for 2.6.17 and later kernels..
This saves on a whole bunch of unresolved symbols being logged and should
allow scsi systems to work again..
Modified Paths:
--------------
trunk/scripts-base/miniroot/debian/control
trunk/scripts-base/miniroot/linuxrc-scripts/debian/control
trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc
trunk/scripts-base/miniroot/mkminiroot.sh
Modified: trunk/scripts-base/miniroot/debian/control
===================================================================
--- trunk/scripts-base/miniroot/debian/control 2007-05-22 11:00:27 UTC (rev 2492)
+++ trunk/scripts-base/miniroot/debian/control 2007-05-22 15:34:42 UTC (rev 2493)
@@ -1,12 +1,12 @@
Source: miniroot-morphix
-Section: unknown
+Section: utils
Priority: optional
Maintainer: Omega User <al...@am...>
Build-Depends: debhelper (>= 4.0.0)
Standards-Version: 3.6.0
Package: mkminiroot-morphix
-Architecture: any
+Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, morphix-deb-get
Description: creates a miniroot/initrd for Morphix using an existing base module
mkminiroot grabs a number of necessary debian udeb's, copies some kernel
Modified: trunk/scripts-base/miniroot/linuxrc-scripts/debian/control
===================================================================
--- trunk/scripts-base/miniroot/linuxrc-scripts/debian/control 2007-05-22 11:00:27 UTC (rev 2492)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/debian/control 2007-05-22 15:34:42 UTC (rev 2493)
@@ -5,7 +5,7 @@
Standards-Version: 3.6.1
Package: morphix-miniroot-linuxrc
-Architecture: any
+Architecture: all
XC-Package-Type: udeb
Depends: ${shlibs:Depends}
Priority: extra
Modified: trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc
===================================================================
--- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2007-05-22 11:00:27 UTC (rev 2492)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2007-05-22 15:34:42 UTC (rev 2493)
@@ -28,13 +28,14 @@
# Possible segfault with 2.6 ??
# aha1740.ko, atp870u.ko, megaraid.ko, qlogicfc.ko, a100u2w.ko
KEXT=".ko"
-SCSI_MODULES="aic7xxx$KEXT BusLogic$KEXT \
+SCSI_MODULES="scsi_mod$KEXT scsi_transport_spi$KEXT \
+aic7xxx$KEXT BusLogic$KEXT \
ncr53c8xx$KEXT NCR53c406a$KEXT \
ata_piix$KEXT \
advansys$KEXT aha1740$KEXT aha1542$KEXT aha152x$KEXT \
atp870u$KEXT dtc$KEXT eata$KEXT fdomain$KEXT gdth$KEXT \
megaraid$KEXT pas16$KEXT pci2220i$KEXT pci2000$KEXT psi240i$KEXT \
-qlogicfas$KEXT qlogicfc$KEXT qlogicisp$KEXT \
+qlogicfas408$KEXT qlogicfas$KEXT qlogicfc$KEXT qlogicisp$KEXT \
seagate$KEXT t128$KEXT tmscsim$KEXT u14-34f$KEXT ultrastor$KEXT wd7000$KEXT \
a100u2w$KEXT 3w-xxxx$KEXT"
Modified: trunk/scripts-base/miniroot/mkminiroot.sh
===================================================================
--- trunk/scripts-base/miniroot/mkminiroot.sh 2007-05-22 11:00:27 UTC (rev 2492)
+++ trunk/scripts-base/miniroot/mkminiroot.sh 2007-05-22 15:34:42 UTC (rev 2493)
@@ -179,6 +179,7 @@
cp $BASEDIR/lib/modules/*/extra/cloop.* $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/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.
|
|
From: <ale...@us...> - 2007-05-24 19:07:55
|
Revision: 2503
http://svn.sourceforge.net/morphix/?rev=2503&view=rev
Author: alextreme
Date: 2007-05-24 12:06:35 -0700 (Thu, 24 May 2007)
Log Message:
-----------
* syncing changelogs to keep paul happy
Modified Paths:
--------------
trunk/scripts-base/miniroot/debian/changelog
trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog
Modified: trunk/scripts-base/miniroot/debian/changelog
===================================================================
--- trunk/scripts-base/miniroot/debian/changelog 2007-05-24 18:40:00 UTC (rev 2502)
+++ trunk/scripts-base/miniroot/debian/changelog 2007-05-24 19:06:35 UTC (rev 2503)
@@ -1,3 +1,9 @@
+miniroot-morphix (0.1-13) unstable; urgency=low
+
+ * bumping, fixes from Paul
+
+ -- root <ro...@al...> Thu, 24 May 2007 21:02:51 +0200
+
miniroot-morphix (0.1-12) unstable; urgency=low
* added cloop-directory (also checks extra/ directory for the kernel module)
Modified: trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog
===================================================================
--- trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog 2007-05-24 18:40:00 UTC (rev 2502)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog 2007-05-24 19:06:35 UTC (rev 2503)
@@ -1,3 +1,9 @@
+morphix-miniroot-linuxrc (0.1-8) unstable; urgency=low
+
+ * fixes from Paul
+
+ -- root <ro...@al...> Thu, 24 May 2007 21:03:18 +0200
+
morphix-miniroot-linuxrc (0.1-7) unstable; urgency=low
* debugmorphix=miniroot fix
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2007-12-31 12:05:37
|
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.
|
|
From: <ale...@us...> - 2008-01-27 14:52:11
|
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.
|
|
From: <ale...@us...> - 2008-01-27 21:34:23
|
Revision: 2612
http://morphix.svn.sourceforge.net/morphix/?rev=2612&view=rev
Author: alextreme
Date: 2008-01-27 13:34:18 -0800 (Sun, 27 Jan 2008)
Log Message:
-----------
* bumping
Modified Paths:
--------------
trunk/scripts-base/miniroot/debian/changelog
trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog
Modified: trunk/scripts-base/miniroot/debian/changelog
===================================================================
--- trunk/scripts-base/miniroot/debian/changelog 2008-01-27 21:32:51 UTC (rev 2611)
+++ trunk/scripts-base/miniroot/debian/changelog 2008-01-27 21:34:18 UTC (rev 2612)
@@ -1,3 +1,9 @@
+miniroot-morphix (0.1-15) unstable; urgency=low
+
+ * Number of minor USB drive fixes (By Markus Mandalka)
+
+ -- root <ro...@io...> Sun, 27 Jan 2008 22:33:50 +0100
+
miniroot-morphix (0.1-14) unstable; urgency=low
* Add cdrom.ko to the list of modules to load.
Modified: trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog
===================================================================
--- trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog 2008-01-27 21:32:51 UTC (rev 2611)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/debian/changelog 2008-01-27 21:34:18 UTC (rev 2612)
@@ -1,3 +1,9 @@
+morphix-miniroot-linuxrc (0.1-10) unstable; urgency=low
+
+ * Number of fixes for USB drive booting (From Markus Mandalka)
+
+ -- root <ro...@al...> Sun, 27 Jan 2008 22:33:03 +0100
+
morphix-miniroot-linuxrc (0.1-9) unstable; urgency=low
* Add cdrom.ko to the list of modules to load.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2008-04-14 11:56:57
|
Revision: 2624
http://morphix.svn.sourceforge.net/morphix/?rev=2624&view=rev
Author: alextreme
Date: 2008-04-14 04:56:54 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
* number of minor changes to get basic USB/SCSI-CD/DVD devices working
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-04-05 18:15:43 UTC (rev 2623)
+++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2008-04-14 11:56:54 UTC (rev 2624)
@@ -218,47 +218,29 @@
echo -n "${CRE}"
}
-case "$CMDLINE" in *bootusb2*) USBBOOT2="yes"; ;; esac
-case "$CMDLINE" in *bootusb1*) USBBOOT1="yes"; ;; esac
-case "$CMDLINE" in *vfat*) VFAT="yes"; ;; esac
-
-if test -n "$VFAT"
- then
# load modules needed to use VFAT filesystem
- $INSMOD -f /modules/nls/nls_cp437$KEXT >/dev/null
- $INSMOD -f /modules/nls/nls_iso8859-1$KEXT >/dev/null
-fi
+$INSMOD -f /modules/nls/nls_cp437$KEXT >/dev/null
+$INSMOD -f /modules/nls/nls_iso8859-1$KEXT >/dev/null
-if test -n "$USBBOOT2" -o -n "$USBBOOT1"
- then
-# load usb-modules first (so that memory-stick becomes /dev/sda1)
- echo "6" > /proc/sys/kernel/printk
-
- # NLS charsets required for VFAT-formatted USB drives
- $INSMOD -f /modules/nls/nls_iso8859-1$KEXT >/dev/null
- $INSMOD -f /modules/nls/nls_cp437$KEXT >/dev/null
+# SCSI modules need to be loaded before usb-storage
+$INSMOD -f /modules/scsi/scsi_mod$KEXT >/dev/null
+$INSMOD -f /modules/scsi/sg$KEXT >/dev/null
+$INSMOD -f /modules/scsi/sr_mod$KEXT >/dev/null
+$INSMOD -f /modules/scsi/sd_mod$KEXT >/dev/null
+$INSMOD -f /modules/scsi/st$KEXT >/dev/null
+
+$INSMOD -f /modules/usb/usbcore$KEXT >/dev/null
+
+$INSMOD -f /modules/usb/ehci-hcd$KEXT >/dev/null
+$INSMOD -f /modules/usb/uhci-hcd$KEXT >/dev/null
+$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
- # scsi_mod and sd_mod SCSI modules need to be loaded before usb-storage
- $INSMOD -f /modules/scsi/scsi_mod$KEXT >/dev/null
- $INSMOD -f /modules/usb/usbcore$KEXT >/dev/null
- FOUNDUSB=""
- if test -n "$USBBOOT2"
- then
- $INSMOD -f /modules/usb/ehci-hcd$KEXT >/dev/null && FOUNDUSB="yes"
- fi
- if test -n "$USBBOOT1"
- then
- $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/scsi/sd_mod$KEXT >/dev/null
- $INSMOD -f /modules/usb/usb-storage$KEXT >/dev/null
+# Wait for devices to be registered
+sleep 2
+echo "0" > /proc/sys/kernel/printk
- # wait 5 seconds for usb device to be registered
- sleep 5
- echo "0" > /proc/sys/kernel/printk
-fi
-
# Check for a Firewire Cdrom boot -- thanatermesis
if test -z "$NOFIREWIRE"; then
@@ -282,21 +264,7 @@
fi
# End of FIREWIRE check
-# Unfortunately, hotpluggable devices tend to need some time in order to register
-if test -n "$FOUNDUSB" -o -n "$FOUNDFIREWIRE"; then
- echo -n "${CRE}${BLUE}Scanning for USB/Firewire devices... ${NORMAL}"
- if test -n "$FOUNDFIREWIRE"; then
-# Wait for driver to register
- sleep 2
-# Kernel 2.6 does this automatically
- case "$(cat /proc/version 2>/dev/null)" in *version\ 2.6.*) ;; *) for host in 0 1 2 3 4 5 6 7; do for channel in 0 1; do for id in 0 1 2 3 4 5 6 7; do echo "scsi add-single-device $host $channel $id 0" >/proc/scsi/scsi 2>/dev/null; done; done; done ;; esac
- fi
- sleep 6
- echo "${BLUE}Done.${NORMAL}"
-fi
-# <--- thanatermesis (Firewire)
-
# Check for SCSI, use modules on bootfloppy first
if test -n "$INTERACTIVE"; then
# Let the user select interactively
@@ -342,16 +310,12 @@
# Now that the right SCSI driver is (hopefully) loaded, try to find CDROM
DEVICES="/dev/hd?"
test -n "$FOUND_SCSI" -a -z "$NOCD" && DEVICES="/dev/scd? /dev/scd?? $DEVICES"
-# New: Also try parallel port CD-Roms [for Mike].
DEVICES="$DEVICES /dev/pcd?"
-# New: also check HD partitions for a MORPHIX/MORPHIX image
-test -n "$FOUND_SCSI" && DEVICES="$DEVICES /dev/sd?[1-9] /dev/sd?[1-9][0-9]"
-test -n "$USBBOOT2" -o -n "$USBBOOT1" && DEVICES="$DEVICES /dev/sda1"
+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"
+DEVICES="$DEVICES /dev/hd?[1-9] /dev/hd?[1-9][0-9]"
-#UML device
-#DEVICES="$DEVICES /dev/ubd[1-9]"
-
MOUNT_IMAGE="cdrom"
MOUNT_OPT="ro"
#you could not define a directory with space
@@ -437,11 +401,9 @@
fi
fi
-# Harddisk-installed script part version has been removed
-# (MORPHIX can be booted directly from HD now).
if test -n "$FOUND_MORPHIX" -a -f /cdrom/base/morphix; then
-# DEBUG
+
if test -n "$DEBUG"; then
echo "6" > /proc/sys/kernel/printk
fi
@@ -450,15 +412,26 @@
$LOSETUP /dev/cloop /cdrom/base/morphix
mountit /dev/cloop /MorphixCD "-o ro" || FOUND_MORPHIX="" 2> /dev/null
else
- echo "Warning: unable to find base module!"
- echo ""
- echo "Dropping you to a simple shell. Make sure /cdrom/base/morphix exists!"
- PS1="morphix# "
- export PS1
- echo "6" > /proc/sys/kernel/printk
+ # Wait until any USB/SCSI devices have been registered, and try again
+ # This is a poor fallback, but tends to work for certain devices
+ sleep 10
+ mount /dev/scd0 /cdrom
+
+ if test -f /cdrom/base/morphix; then
+ $INSMOD -f /modules/cloop$KEXT 2> /dev/null
+ $LOSETUP /dev/cloop /cdrom/base/morphix
+ mountit /dev/cloop /MorphixCD "-o ro" || FOUND_MORPHIX="" 2> /dev/null
+ else
+ echo "Warning: unable to find base module!"
+ echo ""
+ echo "Dropping you to a simple shell. Make sure /cdrom/base/morphix exists!"
+ PS1="morphix# "
+ export PS1
+ echo "6" > /proc/sys/kernel/printk
# Allow signals
- trap 1 2 3 15
- exec /static/ash
+ trap 1 2 3 15
+ exec /static/ash
+ fi
fi
# COPYTORAM copied (ironic, isn't it?) from Fabian's linuxrc.rampatch 2003-07-26
Modified: trunk/scripts-base/miniroot/mkminiroot.sh
===================================================================
--- trunk/scripts-base/miniroot/mkminiroot.sh 2008-04-05 18:15:43 UTC (rev 2623)
+++ trunk/scripts-base/miniroot/mkminiroot.sh 2008-04-14 11:56:54 UTC (rev 2624)
@@ -179,7 +179,7 @@
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/{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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X