[oe-commits] org.oe.dev slugos-init: Changed boot scripts to only load modules if they are not already loaded

[rwhitby commit]

slugos-init: Changed boot scripts to only load modules if they are not already loaded

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 1af32cac223255a8b64acab6e9b8aa5a8c5f3142
ViewMTN: http://monotone.openembedded.org/revision/info/1af32cac223255a8b64acab6e9b8aa5a8c5f3142
Files:
1
packages/slugos-init/files/modulefunctions
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_4.8.bb
Diffs:

#
# mt diff -rb7c384ae465079ec2295b2e95072191834385967 -r1af32cac223255a8b64acab6e9b8aa5a8c5f3142
#
#
#
# patch "packages/slugos-init/files/modulefunctions"
#  from [7ffd6c95d6a361b24b12da8f5bae1e016237a845]
#    to [67adae1c30b980d41ab5e522a495c2850348bded]
# 
# patch "packages/slugos-init/files/turnup"
#  from [9b5fe01bdf98e32a3d849b4f44d57f5329ac5862]
#    to [7f0ad6124d8e29ed12f05fadc80d7688678b8652]
# 
# patch "packages/slugos-init/slugos-init_4.8.bb"
#  from [3cc7d29041e1c5b8ccd51759b5772dd0a44bb8e3]
#    to [d527fb3796c109605dc769795fc18fb7f0c2e066]
#
============================================================
--- packages/slugos-init/files/modulefunctions	7ffd6c95d6a361b24b12da8f5bae1e016237a845
+++ packages/slugos-init/files/modulefunctions	67adae1c30b980d41ab5e522a495c2850348bded
@@ -6,29 +6,29 @@ loaddiskmods(){
 
 loaddiskmods(){
 	case "$(machine)" in
-	    nslu2)                     
-	        modprobe ehci-hcd
-	        modprobe ohci-hcd
+	    nslu2)		       
+		[ -d /sys/module/ehci_hcd ]   || modprobe ehci-hcd
+		[ -d /sys/module/ohci_hcd ]   || modprobe ohci-hcd
 		;;
-            nas100d)
-	        modprobe ehci-hcd
-                modprobe uhci-hcd
-                modprobe pata-artop
-                ;;
-            dsmg600)
-	        modprobe ehci-hcd
-                modprobe uhci-hcd
-                modprobe pata-artop
-                ;;
+	    nas100d)
+		[ -d /sys/module/ehci_hcd ]   || modprobe ehci-hcd
+		[ -d /sys/module/uhci_hcd ]   || modprobe uhci-hcd
+		[ -d /sys/module/pata_artop ] || modprobe pata-artop
+		;;
+	    dsmg600)
+		[ -d /sys/module/ehci_hcd ]   || modprobe ehci-hcd
+		[ -d /sys/module/uhci_hcd ]   || modprobe uhci-hcd
+		[ -d /sys/module/pata_artop ] || modprobe pata-artop
+		;;
 
 	esac
 }
 
 loadnetmods(){
 	case "$(machine)" in
-            dsmg600)
-                modprobe via-velocity
-                ;;
+	    dsmg600)
+		[ -d /sys/module/via_velocity ] || modprobe via-velocity
+		;;
 	    *)
 		true
 		;;
@@ -36,7 +36,7 @@ loadnfsmods(){
 }
 
 loadnfsmods(){
-	modprobe nfs
+	[ -d /sys/module/nfs ] || modprobe nfs
 }
 
 loadmiscmods(){
============================================================
--- packages/slugos-init/files/turnup	9b5fe01bdf98e32a3d849b4f44d57f5329ac5862
+++ packages/slugos-init/files/turnup	7f0ad6124d8e29ed12f05fadc80d7688678b8652
@@ -490,12 +490,6 @@ boot_rootfs() {
 			return 1
 		};;
 	*)	{	echo '#!/bin/sh'
-#			echo 'modprobe ehci-hcd'
-#			echo 'modprobe ohci-hcd'
-#			echo 'modprobe sd_mod'
-#			echo 'modprobe usb-storage'
-#			echo 'modprobe ext3'
-#			echo 'sleep 5'
 			echo 'leds beep'
 			test "$sleep" -gt 0 && echo -n "sleep='$sleep' "
 			test -n "$uuid" && echo -n "UUID='$uuid' "
============================================================
--- packages/slugos-init/slugos-init_4.8.bb	3cc7d29041e1c5b8ccd51759b5772dd0a44bb8e3
+++ packages/slugos-init/slugos-init_4.8.bb	d527fb3796c109605dc769795fc18fb7f0c2e066
@@ -4,7 +4,7 @@ RDEPENDS = "busybox devio"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \