SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Thu Jan  5 20:54:16 2012
New Revision: 12459

Modified:
   geninitrd/trunk/geninitrd
Log:
load hpsa (and cciss) for 3.0 kernels with /dev/cciss devices

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Thu Jan  5 20:54:16 2012
@@ -559,8 +559,15 @@
 	fi
 
 	if [[ "$devpath" == /dev/cciss/* ]]; then
-		find_module "cciss"
 		rootdev_add=/dev/cciss/
+
+		# load hpsa for future kernels, cciss for backwards compat
+		if [ "$kernel_version_long" -ge "003000000" ]; then
+			find_module "hpsa" "-cciss"
+		else
+			find_module "cciss"
+		fi
+
 		return
 	fi