SVN: geninitrd/trunk/geninitrd

[arekm]

Author: arekm
Date: Tue Jul 15 10:27:19 2008
New Revision: 9842

Modified:
   geninitrd/trunk/geninitrd
Log:
Always force firmware install.

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Tue Jul 15 10:27:19 2008
@@ -945,7 +945,6 @@
 firmware_install_module() {
 	local module="$1"
 	local firmware_files="$2"
-	local force="$3"
 
 	debug "Adding Firmwares ($firmware_files) to initrd for module $module"
 	# firmware not yet installed
@@ -963,11 +962,7 @@
 
 	for firmware in $firmware_files; do
 		if [ ! -f "/lib/firmware/$firmware" ]; then
-			if [ -n "$force" ]; then
 				die "firmware file /lib/firmware/$firmware doesn't exist."
-			else
-				warn "firmware file /lib/firmware/$firmware doesn't exist. Skipping."
-			fi
 		else
 			FIRMWAREDIR=${firmware%/*}
 			[ "$FIRMWAREDIR" != "$firmware" ] && inst_d /lib/firmware/$FIRMWAREDIR
@@ -1020,7 +1015,7 @@
 		fi
 
 		if [ -n "$firmware_var" ]; then
-			firmware_install_module "$module" "$firmware_var" "force=yes"
+			firmware_install_module "$module" "$firmware_var"
 		else
 			firmware_files=$(find_firmware "$module")
 			if [ -n "$firmware_files" ]; then