bootdisk/trunk/batch-installer/installer-prep

[hawk]

Author: hawk
Date: Tue Dec  6 22:49:37 2005
New Revision: 6603

Modified:
   bootdisk/trunk/batch-installer/installer-prep
Log:
- ide-detect is always required with IDE drivers
- perform load_device_modules basename checking after
  getting to the source (again)
- moved load_device_modules call to fix problem with
  load_package on network based installs


Modified: bootdisk/trunk/batch-installer/installer-prep
==============================================================================
--- bootdisk/trunk/batch-installer/installer-prep	(original)
+++ bootdisk/trunk/batch-installer/installer-prep	Tue Dec  6 22:49:37 2005
@@ -387,13 +387,14 @@
 
   local detected_ide detectded_scsi
   detected_ide=`detect-pci-devices ide -m`
-  detected_ide="$detected_ide ide-detect"
   detected_scsi=`detect-pci-devices scsi -m`
 
-  # go through list of modules and load them or call required functions
+  # go through list of modules and load them, skip or call required functions
   for module in $1; do
 
-    if test "x$module" = "xcpqarray"; then
+    if test "x$module" = "xide-generic"; then
+      : skip
+    elif test "x$module" = "xcpqarray"; then
       . installer-raid-functions
       setup_cpqarray
     elif test "x$module" = "xcciss"; then
@@ -429,7 +430,13 @@
           rm -f $i.tmp
         fi
       done
-      # check if ide-disk is loaded and if not, load it
+      # check if ide-detect is loaded and if not, load it
+      if lsmod | grep -q '^ide-detect ' ; then
+        : skip
+      else
+        load_module ide-detect
+      fi
+      # same for ide-disk
       if lsmod | grep -q '^ide-disk ' ; then
         : skip
       else
@@ -492,9 +499,6 @@
 # invoked as load_nodule runs function load_module,
 if test "x`basename $0 || :`" = "xload_module"; then 
     load_module "$@"; exit $?
-# invoked as load_device_modules, runs function load_device_modules
-elif test "x`basename $0`" = "xload_device_modules"; then
-    load_device_modules "$@"; exit $?
 elif test "x`basename $0 || :`" = "xinstaller-prep-source"; then
     # only source (and net) parts are prepared
     source_only=yes
@@ -522,12 +526,6 @@
     fi
 fi
 
-######## load hostadapter modules if necessary #########
-
-if ! test -z "$hostadapters_modules"; then
-  load_device_modules $hostadapters_modules
-fi
-
 ############## get to the source ##############
 case "$source" in
     cdrom)
@@ -577,6 +575,17 @@
 # invoked as load_package runs function load_package,
 if test "x`basename $0 || :`" = "xload_package"; then 
     load_package "$@"; exit $?
+# invoked as load_device_modules, runs function load_device_modules
+elif test "x`basename $0`" = "xload_device_modules"; then
+    load_device_modules "$@"; exit $?
+fi
+
+# modules for source/destination devices should be loaded by now
+# but to be sure, lets call it again in case someone has fooled
+# manual installation procedure
+
+if ! test -z "$hostadapters_modules"; then
+  load_device_modules $hostadapters_modules
 fi
 
 ############## install packages needed in next stage ##############