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

diff --git a/packages/slugos-init/files/modulefunctions b/packages/slugos-init/files/modulefunctions
index 82fd768..02bfccb 100644 (file)
--- a/packages/slugos-init/files/modulefunctions
+++ b/packages/slugos-init/files/modulefunctions
@@ -6,29 +6,29 @@
 
 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)
+               [ -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
                ;;
-            nas100d)
-               modprobe ehci-hcd
-                modprobe uhci-hcd
-                modprobe pata-artop
-                ;;
-            dsmg600)
-               modprobe ehci-hcd
-                modprobe uhci-hcd
-                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 @@ loadnetmods(){
 }
 
 loadnfsmods(){
-       modprobe nfs
+       [ -d /sys/module/nfs ] || modprobe nfs
 }
 
 loadmiscmods(){

diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup
index 8d4c3f0..c622007 100644 (file)
--- a/packages/slugos-init/files/turnup
+++ b/packages/slugos-init/files/turnup
@@ -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' "

diff --git a/packages/slugos-init/slugos-init_4.8.bb b/packages/slugos-init/slugos-init_4.8.bb
index ebb6ff7..2eca9c9 100644 (file)
--- a/packages/slugos-init/slugos-init_4.8.bb
+++ b/packages/slugos-init/slugos-init_4.8.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://boot/flash \
           file://boot/disk \