SVN: geninitrd/trunk/geninitrd

glen glen at pld-linux.org
Wed Oct 24 17:55:25 CEST 2007


Author: glen
Date: Wed Oct 24 17:55:25 2007
New Revision: 8852

Modified:
   geninitrd/trunk/geninitrd
Log:
- rename find_modules_for() -> find_modules_for_device() to avoid confusion

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Wed Oct 24 17:55:25 2007
@@ -356,7 +356,7 @@
 	eval "dev_list${rootdev_nr}=\"${dev_list}\""
 
 	for device in $dev_list; do
-		find_modules_for $device
+		find_modules_for_device $device
 	done
 }
 
@@ -512,10 +512,10 @@
 }
 
 # find modules for $devpath
-find_modules_for() {
+find_modules_for_device() {
 	local devpath="$1"
 	if [ -z "$devpath" ]; then
-		die "No argument passed to find_modules_for() - is your /etc/fstab correct?"
+		die "No argument passed to find_modules_for_device() - is your /etc/fstab correct?"
 	fi
 
 	# /dev/dm-3 -> /dev/mapper/sil_ahbgadcbchfc3
@@ -573,7 +573,7 @@
 		blockdev=${devpath%%[0-9]*}
 		blockdev=${blockdev#/dev/mapper/}
 		for node in $(dmraid -r -cdevpath,raidname |awk -F, -vv="$blockdev" '{if ($2 == v) print $1}'); do
-			find_modules_for $node
+			find_modules_for_device $node
 			dmraid_devices="$dmraid_devices $node"
 		done
 
@@ -652,7 +652,7 @@
 		fi
 		if [ -n "$PVDEVICES" ] ; then
 			for device in $PVDEVICES; do
-				find_modules_for $device
+				find_modules_for_device $device
 			done
 		else
 			die "I wasn't able to find PV (via lvdisplay and pvdisplay). You can try to set PVDEVICES in /etc/sysconfig/geninitrd."
@@ -1045,8 +1045,8 @@
 find_root "$fstab" || exit
 debug "Using $rootdev as device for rootfs"
 
-find_modules_for "$rootdev"
-[ -n "$rootdev_add" ] && find_modules_for "$rootdev_add"
+find_modules_for_device "$rootdev"
+[ -n "$rootdev_add" ] && find_modules_for_device "$rootdev_add"
 
 findmodule "-$rootFs"
 


More information about the pld-cvs-commit mailing list