Modify modules initscript to softly fail module loads.
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Apr 2010 16:03:22 +0000 (18:03 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Apr 2010 16:03:22 +0000 (18:03 +0200)
This won't be a critical error if a module is not loadable.

src/initscripts/init.d/modules

index 6be87f4..a51694a 100644 (file)
@@ -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