bootdisk/trunk/batch-installer/installer-prep

[hawk]

Author: hawk
Date: Sat Dec  3 18:37:39 2005
New Revision: 6585

Modified:
   bootdisk/trunk/batch-installer/installer-prep
Log:
- load sd_mod only if scsi_mod is already loaded to avoid it when
  its not necessary (ie. for DAC960)
- cosmetics


Modified: bootdisk/trunk/batch-installer/installer-prep
==============================================================================
--- bootdisk/trunk/batch-installer/installer-prep	(original)
+++ bootdisk/trunk/batch-installer/installer-prep	Sat Dec  3 18:37:39 2005
@@ -417,9 +417,7 @@
           rm -f $i.tmp
         fi
       done
-      # if ide-disk is already loaded we havn't got anything to do.
-      # note that this ain't that simple with SCSI -- scsi_hostadapter
-      # might have been changed since last load etc.
+      # check if ide-disk is loaded and if not, load it
       if lsmod | grep -q '^ide-disk ' ; then
         : skip
       else
@@ -441,10 +439,14 @@
           rm -f $i.tmp
         fi
       done
+      # check if sd_mod is loaded and if not, load it but only if scsi_mod
+      # is loaded too (to avoid loading it when its not needed ie. for DAC960)
       if lsmod | grep -q '^sd_mod ' ; then
         : skip
       else
-        load_module sd_mod
+        if lsmod | grep -q '^scsi_mod ' ; then
+          load_module sd_mod
+	fi
       fi
     fi
   done