SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Tue Mar  3 11:04:32 2009
New Revision: 10167

Modified:
   geninitrd/trunk/geninitrd
Log:
- pack_version -> kernel_version to avoid confusion what the variable is

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Tue Mar  3 11:04:32 2009
@@ -428,7 +428,7 @@
 # defaults to modprobe -c if not told otherwise, this means include statements
 # work from there.
 cache_modprobe_conf() {
-	if [ "$pack_version" -lt "002005" ]; then
+	if [ "$kernel_version" -lt "002005" ]; then
 		modulefile=/etc/modules.conf
 		if [ ! -f "$modulefile" -a -f /etc/conf.modules ]; then
 			modulefile=/etc/conf.modules
@@ -1409,13 +1409,13 @@
 	warn "/boot/vmlinuz-$kernel doesn't exist, is your /boot mounted?"
 fi
 
-pack_version=$(echo "$kernel" | awk -F. '{print sprintf("%03d%03d",$1,$2)}')
-pack_version_long=$(echo "$kernel" | awk -F. '{print sprintf("%03d%03d%03d",$1,$2,$3)}')
+kernel_version=$(echo "$kernel" | awk -F. '{print sprintf("%03d%03d",$1,$2)}')
+kernel_version_long=$(echo "$kernel" | awk -F. '{print sprintf("%03d%03d%03d",$1,$2,$3)}')
 
 if [ -z "$INITRDFS" ]; then
 	if [ -z "$FS" ]; then
 		# default value
-		if [ "$pack_version" -ge "002005" ]; then
+		if [ "$kernel_version" -ge "002005" ]; then
 			INITRDFS="initramfs"
 		else
 			INITRDFS="rom"
@@ -1426,12 +1426,12 @@
 	fi
 fi
 
-if [ "$pack_version" -lt "002006" ]; then
+if [ "$kernel_version" -lt "002006" ]; then
 	USE_UDEV=no
 	USE_DMRAID=no
 fi
 
-if [ "$pack_version" -ge "002005" ]; then
+if [ "$kernel_version" -ge "002005" ]; then
 	modext=".ko"
 	insmod="insmod"
 fi
@@ -1439,7 +1439,7 @@
 if is_yes "$USEINSMODSTATIC"; then
 	insmod="insmod.static"
 	INSMOD="/sbin/insmod.static"
-	if [ "$pack_version" -lt "002005" -a -f /sbin/insmod.static.modutils ]; then
+	if [ "$kernel_version" -lt "002005" -a -f /sbin/insmod.static.modutils ]; then
 		INSMOD="/sbin/insmod.static.modutils"
 	fi
 	if [ ! -f "$INSMOD" ]; then