SVN: geninitrd/trunk/geninitrd

[blues]

Author: blues
Date: Sat Jul  5 22:27:49 2008
New Revision: 9839

Modified:
   geninitrd/trunk/geninitrd
Log:
- don't try to put devices that are in directories into main /dev
  directory. WARNING - it can break some strange setups but is
  needed for hardware raid like cciss.


Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Sat Jul  5 22:27:49 2008
@@ -849,16 +849,19 @@
 
 	if [[ "$devpath" == /dev/rd/* ]]; then
 		findmodule "DAC960"
+		rootdev_add="/dev/rd"
 		return
 	fi
 
 	if [[ "$devpath" == /dev/ida/* ]]; then
 		findmodule "cpqarray"
+		rootdev_add="/dev/ida"
 		return
 	fi
 
 	if [[ "$devpath" == /dev/cciss/* ]]; then
 		findmodule "cciss"
+		rootdev_add="/dev/cciss/"
 		return
 	fi
 
@@ -873,6 +876,7 @@
 		for n in $ataraidmodules; do
 			findmodule "$n"
 		done
+		rootdev_add="/dev/ataraid/"
 		return
 	fi
 
@@ -2075,7 +2079,7 @@
 	if [ "$rootdev" = "/dev/nfs" ]; then
 		echo "rootfs on NFS root=/dev/nfs"
 	else
-		[ ! -e "$DESTDIR/$rootdev" ] && inst $rootdev /dev
+		[ ! -e "$DESTDIR/$rootdev" ] && inst $rootdev $rootdev
 	fi
 	# Parsing root parameter
 	# We support passing root as hda3 /dev/hda3 0303 0x0303 and 303