Add nodetect and doload patch from bug #102643, with some modifications.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@311 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index c845bbd5602ef38bd6c9df7be0c34e6fcf41b3c8..e9594e612224159cd694082e4e1f2bec9773151c 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -26,6 +26,15 @@ parse_opt() {
        esac
 }
 
+modules_load() {
+       for module in $*
+       do
+               echo ${module} >> /etc/modules/extra_load
+       done
+
+       modules_scan extra_load
+}
+
 modules_scan() {
        local MODS
        [ -d /etc/modules/${1} ] || touch /etc/modules/${1}

diff --git a/generic/linuxrc b/generic/linuxrc
index 20ae66278b734b630e585607a98d4264e78e866f..c31a8a576daa15130a6ec1a8a8379b97dea226ed 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -139,12 +139,12 @@ do
       doevms2)
          USE_EVMS2_NORMAL=1
          ;;
-           # Start Debug Option
+      # Debug Options
       debug)
          DEBUG='yes'
          ;;
 
-      # Scandelay options 
+      # Scan delay options 
       scandelay\=*)
          SDELAY=`parse_opt "${x}"`
          ;;
@@ -153,9 +153,16 @@ do
          ;;
 
       # Module no-loads
+      doload\=*)
+          MDOLIST=`parse_opt "${x}"`
+          MDOLIST="`echo ${MDOLIST} | sed -e \"s/,/ /g\"`"
+          ;;
+      nodetect)
+          NODETECT=1
+          ;;
       noload\=*)
          MLIST=`parse_opt "${x}"`
-         MLIST="`echo ${MLIST} | sed -e \"s/,/ /\"`"
+         MLIST="`echo ${MLIST} | sed -e \"s/,/ /g\"`"
          export MLIST
          ;;
 
@@ -190,16 +197,21 @@ detect_sbp2_devices
 cmdline_hwopts
 
 # Load modules listed in MY_HWOPTS if /lib/modules exists
-    
 if [ -d '/lib/modules' ]
 then
     good_msg 'Loading modules'
     # Load appropriate kernel modules
-    for modules in $MY_HWOPTS
-    do
-      modules_scan $modules
-      eval DO_`echo $modules | sed 's/-//'`=1
-    done
+    if [ "${NODETECT}" -ne '1' ]
+    then
+      for modules in $MY_HWOPTS
+      do
+        modules_scan $modules
+        eval DO_`echo $modules | sed 's/-//'`=1
+      done
+    fi
+
+    # Always eval doload=...
+    modules_load $MDOLIST
 else
     for modules in $MY_HWOPTS
     do