[oe-commits] org.oe.dev slugos-init: Add scripts to autoload relevant modules

[blaster8 commit]

slugos-init: Add scripts to autoload relevant modules
* Required for ixp4xx-kernel_2.6.18 and higher due to modularisation

Author: blaster8 at nslu2-linux.org
Branch: org.openembedded.dev
Revision: bc7feeb94e751104c2cfb6d0338cc9aa46045de1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=bc7feeb94e751104c2cfb6d0338cc9aa46045de1
Files:
1
packages/slugos-init/files/initscripts/loadmiscmod.sh
packages/slugos-init/files/initscripts/loadnetmod.sh
packages/slugos-init/files/initscripts/loadusbmod.sh
packages/slugos-init/slugos-init_0.10.bb
Diffs:

#
# mt diff -r10533d3f17b4af0a4b427f743d3be4be9491c528 -rbc7feeb94e751104c2cfb6d0338cc9aa46045de1
#
# 
# 
# add_file "packages/slugos-init/files/initscripts/loadmiscmod.sh"
#  content [78c7387db06e49671a163a8e802f042590a0d4ac]
# 
# add_file "packages/slugos-init/files/initscripts/loadnetmod.sh"
#  content [c19217c1f66a4498b5d4c04f5eee892cf786ad08]
# 
# add_file "packages/slugos-init/files/initscripts/loadusbmod.sh"
#  content [6b91d45c48f4e224062c19342487942c258f731d]
# 
# patch "packages/slugos-init/slugos-init_0.10.bb"
#  from [94c9feafa25726ec46563ff14074ccc42cbcdb03]
#    to [9190f47ed2a587818058c2972f7b4b37bf363105]
# 
============================================================
--- packages/slugos-init/files/initscripts/loadmiscmod.sh	78c7387db06e49671a163a8e802f042590a0d4ac
+++ packages/slugos-init/files/initscripts/loadmiscmod.sh	78c7387db06e49671a163a8e802f042590a0d4ac
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# This script is used for loading modules required for other purposes than
+# usb or networking
+
+# A way of finding which embedded board SlugOS is being run on is needed 
+
+echo "Loading misc modules"
+modprobe ixp4xx_rng
+modprobe i2c_dev
+
+exit 0
============================================================
--- packages/slugos-init/files/initscripts/loadnetmod.sh	c19217c1f66a4498b5d4c04f5eee892cf786ad08
+++ packages/slugos-init/files/initscripts/loadnetmod.sh	c19217c1f66a4498b5d4c04f5eee892cf786ad08
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# This script is used for loading modules required for networking
+
+# A way of finding which embedded board SlugOS is being run on is needed 
+
+echo "Loading networking modules"
+
+modprobe af_packet #Required for DHCP
+
+modprobe ixp4xx_npe
+sleep 1 #Allow Firmware Load
+
+#Conditional required: Not all IXP4xx boards use onboard MAC
+modprobe ixp4xx_mac
+
+exit 0
============================================================
--- packages/slugos-init/files/initscripts/loadusbmod.sh	6b91d45c48f4e224062c19342487942c258f731d
+++ packages/slugos-init/files/initscripts/loadusbmod.sh	6b91d45c48f4e224062c19342487942c258f731d
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# This script is used for loading modules required for usb storage devices
+# As this script is run very early in the boot process, insmod is used
+
+echo "Loading usb storage modules"
+insmod /lib/modules/2.6.18/kernel/drivers/scsi/scsi_mod.ko
+insmod /lib/modules/2.6.18/kernel/drivers/usb/core/usbcore.ko
+#Conditional required: NSLU2 has ohci/ehci but others have uhci/ehci
+insmod /lib/modules/2.6.18/kernel/drivers/usb/host/ohci-hcd.ko
+insmod /lib/modules/2.6.18/kernel/drivers/usb/host/ehci-hcd.ko
+insmod /lib/modules/2.6.18/kernel/drivers/usb/storage/usb-storage.ko
+
+echo "Loading ext2/3 support"
+insmod /lib/modules/2.6.18/kernel/fs/mbcache.ko
+insmod /lib/modules/2.6.18/kernel/fs/jbd/jbd.ko
+insmod /lib/modules/2.6.18/kernel/fs/ext2/ext2.ko
+insmod /lib/modules/2.6.18/kernel/fs/ext3/ext3.ko
+
+exit 0
============================================================
--- packages/slugos-init/slugos-init_0.10.bb	94c9feafa25726ec46563ff14074ccc42cbcdb03
+++ packages/slugos-init/slugos-init_0.10.bb	9190f47ed2a587818058c2972f7b4b37bf363105
@@ -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 = "r62"
+PR = "r63"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
@@ -21,6 +21,9 @@ SRC_URI = "file://boot/flash \
 	   file://initscripts/rmrecovery \
 	   file://initscripts/sysconfsetup \
 	   file://initscripts/umountinitrd.sh \
+	   file://initscripts/loadusbmod.sh \
+	   file://initscripts/loadnetmod.sh \
+	   file://initscripts/loadmiscmod.sh \
 	   file://functions \
 	   file://conffiles \
 	   file://sysconf \
@@ -37,7 +40,7 @@ INITSCRIPTS = "syslog.buffer syslog.file
 BOOTSCRIPTS = "flash disk nfs ram network udhcpc.script"
 INITSCRIPTS = "syslog.buffer syslog.file syslog.network zleds\
 	leds_startup rmrecovery sysconfsetup umountinitrd.sh\
-	fixfstab"
+	fixfstab loadusbmod.sh loadnetmod.sh loadmiscmod.sh"
 
 # This just makes things easier...
 S="${WORKDIR}"
@@ -120,11 +123,14 @@ pkg_postinst_slugos-init() {
 pkg_postinst_slugos-init() {
 	opt=
 	test -n "$D" && opt="-r $D"
+	update-rc.d $opt loadusbmod.sh		start 6 S .
 	update-rc.d $opt hwclock.sh		start  8 S . start 45 0 6 .
 	update-rc.d $opt umountinitrd.sh	start  9 S .
 	update-rc.d $opt fixfstab		start 10 S .
 	update-rc.d $opt syslog.buffer		start 11 S . start 49 0 6 .
 	update-rc.d $opt sysconfsetup		start 12 S .
+	update-rc.d $opt loadnetmod.sh		start 21 S .
+	update-rc.d $opt loadmiscmod.sh		start 22 S .
 	update-rc.d $opt syslog.file		start 39 S . start 47 0 6 .
 	update-rc.d $opt syslog.network		start 44 S . start 39 0 6 .
 	update-rc.d $opt zleds			start 99 S 1 2 3 4 5 . start 89 0 6 . stop  5 0 1 2 3 4 5 6 .