slugos-init: first stages of fixing disk boot

 * Add module loading in disk and ram bootdisks
 * Should eventually be consolidated - still planning this

diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk
index 6dd7788..02b8ee8 100644 (file)
--- 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 a7c78b3..4729e16 100644 (file)
--- 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 afb1bd7..4c775dd 100644 (file)
--- 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 \