[oe-commits] org.oe.dev slugos-init: Further improvements to module loading

[blaster8 commit]

slugos-init: Further improvements to module loading

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

#
# mt diff -r8dcac6d1b8811f90c2e9d9ec5bb911e3fc8d9259 -rfdaad16592058e7e3020ce9a75962b0be856a2f6
#
# 
# 
# add_file "packages/slugos-init/files/modulefunctions"
#  content [35b64c073fa3c16ec39e1e4cf1b739ba3972d981]
# 
# patch "packages/slugos-init/files/boot/disk"
#  from [bf9133a87e100f13901a997ff267050975248bad]
#    to [32b6c2de5106fbad06a1749550260ce1bcfe84d2]
# 
# patch "packages/slugos-init/files/initscripts/loadmodules.sh"
#  from [3acb608206d7754011945ca7ba8e45f18e4a90da]
#    to [73047005b32579a9f40c1dd7bb3fc1a2fbee8cf1]
# 
# patch "packages/slugos-init/slugos-init_0.10.bb"
#  from [0f1ec24220ffd684c21edcd8db62bb273fc444d6]
#    to [24072028aa41929f93c28c6ab7b812f89a207f08]
# 
============================================================
--- packages/slugos-init/files/modulefunctions	35b64c073fa3c16ec39e1e4cf1b739ba3972d981
+++ packages/slugos-init/files/modulefunctions	35b64c073fa3c16ec39e1e4cf1b739ba3972d981
@@ -0,0 +1,37 @@
+#!/bin/sh
+# . this file to load the functions for automatically loading modules
+
+. /etc/default/functions
+
+loaddiskmods(){
+	modprobe scsi_mod
+	modprobe sd_mod 
+	modprobe usbcore 
+	case "$(machine)" in
+	    nslu2)                     
+	        modprobe ehci-hcd
+	        modprobe ohci-hcd
+		;;
+            nas100d)
+                modprobe ehci-hcd
+                modprobe uhci-hcd
+                ;;
+
+	esac
+	modprobe usb-storage
+}
+
+loadnetmods(){
+	modprobe af_packet
+	case "$(machine)" in
+	    ixdp425|nslu2|nas100d)
+	        modprobe ixp4xx_mac
+	        ;;                     
+	esac
+}
+
+loadmiscmods(){
+	modprobe ixp4xx_rng
+	modprobe i2c_dev
+}
+
============================================================
--- packages/slugos-init/files/boot/disk	bf9133a87e100f13901a997ff267050975248bad
+++ packages/slugos-init/files/boot/disk	32b6c2de5106fbad06a1749550260ce1bcfe84d2
@@ -26,7 +26,7 @@ then
 	#
 	# load USB & SCSI storage modules (/proc required!)
 	echo "boot: loading modules required for boot"
-	loadusbmods
+	loaddiskmods
 	#
 	# Mount read-write because before exec'ing init
 	# If a UUID is given (in the environment) this
============================================================
--- packages/slugos-init/files/initscripts/loadmodules.sh	3acb608206d7754011945ca7ba8e45f18e4a90da
+++ packages/slugos-init/files/initscripts/loadmodules.sh	73047005b32579a9f40c1dd7bb3fc1a2fbee8cf1
@@ -1,18 +1,15 @@
 #!/bin/sh
 
 # This script is used for loading modules required by SlugOS
-# Currently, this script only supports the NSLU2
+# This script may not be necessary if udev is present, but is included
+# for 'backup' purposes in case udev is playing silly buggers
 
-. /etc/default/functions # Load $(machine) function required
-. /etc/default/modulefunctions
+. /etc/default/modulefunctions # Load module loading logic
 
-echo "Loading networking modules"
 loadnetmods
 
-echo "Loading usb storage modules"
-loadusbmods
+loaddiskmods
 
-echo "Loading other modules"
 loadmiscmods
 
 exit 0
============================================================
--- packages/slugos-init/slugos-init_0.10.bb	0f1ec24220ffd684c21edcd8db62bb273fc444d6
+++ packages/slugos-init/slugos-init_0.10.bb	24072028aa41929f93c28c6ab7b812f89a207f08
@@ -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 = "r68"
+PR = "r69"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \