SVN: geninitrd/trunk: mod-dmraid.sh mod-ide.sh mod-luks.sh mod-lvm.sh mod-multipath.sh

[glen]

Author: glen
Date: Tue Mar  3 11:35:58 2009
New Revision: 10170

Modified:
   geninitrd/trunk/mod-dmraid.sh
   geninitrd/trunk/mod-ide.sh
   geninitrd/trunk/mod-luks.sh
   geninitrd/trunk/mod-lvm.sh
   geninitrd/trunk/mod-multipath.sh
Log:
- findmodule -> find_module
- pack_version -> kernel_version

Modified: geninitrd/trunk/mod-dmraid.sh
==============================================================================
--- geninitrd/trunk/mod-dmraid.sh	(original)
+++ geninitrd/trunk/mod-dmraid.sh	Tue Mar  3 11:35:58 2009
@@ -51,7 +51,7 @@
 		return 1
 	fi
 
-	findmodule "dm-mirror"
+	find_module "dm-mirror"
 	have_dmraid=yes
 	return 0
 }

Modified: geninitrd/trunk/mod-ide.sh
==============================================================================
--- geninitrd/trunk/mod-ide.sh	(original)
+++ geninitrd/trunk/mod-ide.sh	Tue Mar  3 11:35:58 2009
@@ -40,10 +40,10 @@
 	local rootblkdev=${disk#/dev/}
 
 	local n
-	if [ "$pack_version_long" -lt "002004021" ]; then
+	if [ "$kernel_version_long" -lt "002004021" ]; then
 		debug "Finding IDE modules for kernels <= 2.4.20"
 		for n in $PREIDEMODSOLD; do
-			findmodule "$n"
+			find_module "$n"
 		done
 	else
 		local tryauto=1
@@ -53,7 +53,7 @@
 				local mod idemodules=$(modprobe_conf | awk '/ide_hostadapter/ && ! /^[\t ]*#/ { print $3; }')
 				for mod in $idemodules; do
 					tryauto=0;
-					findmodule "$mod"
+					find_module "$mod"
 				done
 
 				if [ "$tryauto" -eq 1 ]; then
@@ -114,7 +114,7 @@
 
 						# }}}
 						for nd in $idemodules; do
-							findmodule "-$nd"
+							find_module "-$nd"
 						done
 					# }}}
 					# else tryauto {{{
@@ -126,7 +126,7 @@
 					# }}}
 				fi
 			else
-				findmodule "$n"
+				find_module "$n"
 			fi
 		done
 	fi

Modified: geninitrd/trunk/mod-luks.sh
==============================================================================
--- geninitrd/trunk/mod-luks.sh	(original)
+++ geninitrd/trunk/mod-luks.sh	Tue Mar  3 11:35:58 2009
@@ -62,11 +62,11 @@
 		die "Lost cryptsetup device meanwhile?"
 	fi
 
-	findmodule "dm-crypt"
+	find_module "dm-crypt"
 
 	# TODO: autodetect
-	findmodule "aes"
-	findmodule "cbc"
+	find_module "aes"
+	find_module "cbc"
 
 	have_luks=yes
 

Modified: geninitrd/trunk/mod-lvm.sh
==============================================================================
--- geninitrd/trunk/mod-lvm.sh	(original)
+++ geninitrd/trunk/mod-lvm.sh	Tue Mar  3 11:35:58 2009
@@ -96,10 +96,10 @@
 	fi
 
 	if [ "$LVMTOOLSVERSION" = "2" ]; then
-		findmodule "-dm-mod"
+		find_module "-dm-mod"
 	elif [ "$LVMTOOLSVERSION" = "1" ]; then
-		findmodule "-lvm"
-		findmodule "-lvm-mod"
+		find_module "-lvm"
+		find_module "-lvm-mod"
 	else
 		die "LVM version $LVMTOOLSVERSION is not supported yet."
 	fi

Modified: geninitrd/trunk/mod-multipath.sh
==============================================================================
--- geninitrd/trunk/mod-multipath.sh	(original)
+++ geninitrd/trunk/mod-multipath.sh	Tue Mar  3 11:35:58 2009
@@ -82,15 +82,15 @@
 
 	local hw hwhandlers=$(echo "$info" | awk '/hwhandler=1/{sub(/.*hwhandler=1 /, ""); sub(/\]$/, ""); print}')
 	for hw in $hwhandlers; do
-		findmodule "dm-$hw"
+		find_module "dm-$hw"
 	done
 
 	local target targets=$(echo "$info" | awk '/prio=/{print $2}' | sort -u)
 	for target in $targets; do
-		findmodule "dm-$target"
+		find_module "dm-$target"
 	done
 
-	findmodule "dm-mod"
+	find_module "dm-mod"
 	return 0
 }