From 9149b7013ea36bdad26cc1e6b8b2671b3e47f329 Mon Sep 17 00:00:00 2001 From: Michael-Luke Jones Date: Wed, 27 Sep 2006 22:35:50 +0000 Subject: slugos-init: first stages of fixing disk boot * Add module loading in disk and ram bootdisks * Should eventually be consolidated - still planning this --- packages/slugos-init/files/boot/disk | 13 +++++++++++++ packages/slugos-init/files/boot/ram | 13 +++++++++++++ packages/slugos-init/slugos-init_0.10.bb | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index 6dd7788197..02b8ee82cf 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -11,6 +11,19 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin # leds boot system # +# Load the required SCSI and USB modules 'by hand' +insmod /lib/modules/`uname -r`/kernel/drivers/scsi/scsi_mod.ko +insmod /lib/modules/`uname -r`/kernel/drivers/scsi/sd_mod.ko +insmod /lib/modules/`uname -r`/kernel/drivers/usb/core/usbcore.ko +# Add more cases here for different boards +case "$(machine)" in + nslu2) + insmod /lib/modules/`uname -r`/kernel/drivers/usb/host/ehci-hcd.ko + insmod /lib/modules/`uname -r`/kernel/drivers/usb/host/ohci-hcd.ko + ;; +esac +insmod /lib/modules/`uname -r`/kernel/drivers/usb/storage/usb-storage.ko +# if test -n "$1" then device="$1" diff --git a/packages/slugos-init/files/boot/ram b/packages/slugos-init/files/boot/ram index a7c78b39ac..4729e16a78 100644 --- a/packages/slugos-init/files/boot/ram +++ b/packages/slugos-init/files/boot/ram @@ -12,6 +12,19 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin leds beep -r 2 leds boot system # +# Load the required SCSI and USB modules 'by hand' +insmod /lib/modules/`uname -r`/kernel/drivers/scsi/scsi_mod.ko +insmod /lib/modules/`uname -r`/kernel/drivers/scsi/sd_mod.ko +insmod /lib/modules/`uname -r`/kernel/drivers/usb/core/usbcore.ko +# Add more cases here for different boards +case "$(machine)" in + nslu2) + insmod /lib/modules/`uname -r`/kernel/drivers/usb/host/ehci-hcd.ko + insmod /lib/modules/`uname -r`/kernel/drivers/usb/host/ohci-hcd.ko + ;; +esac +insmod /lib/modules/`uname -r`/kernel/drivers/usb/storage/usb-storage.ko +# if test -n "$1" then device="$1" diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index afb1bd78b4..4c775dd1d7 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r66" +PR = "r67" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3