[readonly/geninitrd: 456/1068] - rename find_modules_for() -> find_modules_for_device() to avoid confusion

draenog draenog at pld-linux.org
Sat Nov 2 19:50:42 CET 2013


commit a8007847900f95a066ba08bde37af534f2e255c3
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Oct 24 15:55:25 2007 +0000

    - rename find_modules_for() -> find_modules_for_device() to avoid confusion
    
    svn-id: @8852

 geninitrd | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/geninitrd b/geninitrd
index 7797522..8926a88 100755
--- a/geninitrd
+++ b/geninitrd
@@ -356,7 +356,7 @@ find_modules_softraid() {
 	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 @@ _check_lvm() {
 }
 
 # 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 @@ find_modules_for() {
 		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 @@ find_modules_for() {
 		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 @@ fi
 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"
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/readonly/geninitrd.git/commitdiff/147754ca159d40ca5eb541074dc043d8cbd92090



More information about the pld-cvs-commit mailing list