bootdisk: installer-raid-functions (HEAD) [malekith]

[PLD CVS]

Module name:	bootdisk
Changes by:	malekith	02/08/27 15:11:33

Modified files:
	installer-raid-functions

Log message:
- load_ide_modules before loading ataraid stuff
- check if ata module is already loaded, load it if not, die if it fails

Index: installer-raid-functions
===================================================================
RCS file: /cvsroot/bootdisk/batch-installer/installer-raid-functions,v
diff -d -u -r1.10 -r1.11
--- installer-raid-functions	2002/08/23 14:39:20	1.10
+++ installer-raid-functions	2002/08/27 13:11:32	1.11
@@ -313,9 +313,16 @@
 }
 
 setup_ataraid () {
+  load_ide_modules
   load_package hdraid-mod ataraid.o hptraid.o pdcraid.o
   load_module ataraid
-  insmod /hptraid.o || insmod /pdcraid.o || :
+  if lsmod | grep -q "^hptraid " ; then
+    :
+  elif lsmod | grep -q "^pdcraid " ; then
+    :
+  else
+    insmod /hptraid.o || insmod /pdcraid.o
+  fi
   # devfs doesn't create /dev/ataraid/dXpY devices...
   for d in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
     mknod /dev/ataraid/d${d} b 114 $(($d * 16)) || :