[oe-commits] org.oe.dev slugos-init: first stages of fixing disk boot

[blaster8 commit]

slugos-init: first stages of fixing disk boot
 * Add module loading in disk and ram bootdisks
 * Should eventually be consolidated - still planning this

Author: blaster8 at nslu2-linux.org
Branch: org.openembedded.dev
Revision: dc9bff2d5c5c9d15c295634de30938d7d01c4a34
ViewMTN: http://monotone.openembedded.org/revision.psp?id=dc9bff2d5c5c9d15c295634de30938d7d01c4a34
Files:
1
packages/slugos-init/files/boot/disk
packages/slugos-init/files/boot/ram
packages/slugos-init/slugos-init_0.10.bb
Diffs:

#
# mt diff -r0b0e5efd590cdcc1847caa5505a008258f7a2e45 -rdc9bff2d5c5c9d15c295634de30938d7d01c4a34
#
# 
# 
# patch "packages/slugos-init/files/boot/disk"
#  from [5aeb4190525845c6d8ef51bed86a318485453548]
#    to [e6516cda7cfdeadff061e3d2abdfc41ee646b6b4]
# 
# patch "packages/slugos-init/files/boot/ram"
#  from [0196e2404034a031dd316f8be685fd7072e05d4a]
#    to [7777a27495729efaf16b2a7ff3b01acbb99278e8]
# 
# patch "packages/slugos-init/slugos-init_0.10.bb"
#  from [f776f0333dc4b5c90668786279466046b6464d5b]
#    to [fbb783f272da87f847d6f1f07755cc6a3a1228c9]
# 
============================================================
--- packages/slugos-init/files/boot/disk	5aeb4190525845c6d8ef51bed86a318485453548
+++ packages/slugos-init/files/boot/disk	e6516cda7cfdeadff061e3d2abdfc41ee646b6b4
@@ -11,6 +11,19 @@ leds boot system
 #
 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"
============================================================
--- packages/slugos-init/files/boot/ram	0196e2404034a031dd316f8be685fd7072e05d4a
+++ packages/slugos-init/files/boot/ram	7777a27495729efaf16b2a7ff3b01acbb99278e8
@@ -12,6 +12,19 @@ leds boot system
 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"
============================================================
--- packages/slugos-init/slugos-init_0.10.bb	f776f0333dc4b5c90668786279466046b6464d5b
+++ packages/slugos-init/slugos-init_0.10.bb	fbb783f272da87f847d6f1f07755cc6a3a1228c9
@@ -1,10 +1,10 @@ RDEPENDS = "busybox devio"
 DESCRIPTION = "SlugOS initial network config via sysconf"
 SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r66"
+PR = "r67"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \