From 590ee44c1495ea67d057e0d21e4ebc25c0e17782 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Mon, 13 Jun 2011 19:07:52 -0400 Subject: rc.sysinit: honor blacklist, not load_modules This is some unfinished business from our removal of load-modules.sh. We call modprobe with -ab for the contents of the MODULES array, which should no longer contain ! prefixed module names. --quiet is explicitly ommitted, as users should be aware of any errors that might occur here. Signed-off-by: Dave Reisner Signed-off-by: Tom Gundersen --- rc.sysinit | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'rc.sysinit') diff --git a/rc.sysinit b/rc.sysinit index 9750913..dd87633 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -87,9 +87,8 @@ stat_busy "Triggering UDev uevents" stat_done # Load modules from the MODULES array defined in rc.conf -mods=${MODULES[@]/!*/} -if [[ $load_modules != off && -f /proc/modules && $mods ]]; then - status "Loading Modules" modprobe --all $mods +if [[ -f /proc/modules ]] && (( ${#MODULES[*]} )); then + status "Loading Modules" modprobe -ab "${MODULES[@]}" fi unset mods -- cgit v1.2.3