From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Apr 2010 16:03:22 +0000 (+0200)
Subject: Modify modules initscript to softly fail module loads.
X-Git-Tag: v2.9-beta1~372^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d3b91323f003b8f1b21a02b19215118739349177

Modify modules initscript to softly fail module loads.

This won't be a critical error if a module is not loadable.
---

diff --git a/src/initscripts/init.d/modules b/src/initscripts/init.d/modules
index 6be87f46d1..a51694aa47 100644
--- a/src/initscripts/init.d/modules
+++ b/src/initscripts/init.d/modules
@@ -54,14 +54,12 @@ case "${1}" in
 
 					# Attempt to load the module, making
 					# sure to pass any arguments provided.
-					modprobe ${module} ${args} 2>&1 > /dev/null
+					modprobe ${module} ${args} &>/dev/null
 
 					# Print the module name if successful,
 					# otherwise take note.
 					if [ ${?} -eq 0 ]; then
 						boot_mesg -n " ${module}" ${NORMAL}
-					else
-						failedmod="${failedmod} ${module}"
 					fi
 				done
 
@@ -70,13 +68,6 @@ case "${1}" in
 				# modules on the correct line.
 				echo_ok
 
-				# Print a failure message with a list of any
-				# modules that may have failed to load.
-				if [ "${failedmod}" ]; then
-					boot_mesg "Failed to load modules:${failedmod}" ${FAILURE}
-					echo_failure
-				fi
-
 			exec 0>&9 9>&-
 
 		fi