diff options
author | Dave Reisner <d@falconindy.com> | 2011-06-13 19:07:52 -0400 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2011-06-14 01:40:43 +0200 |
commit | 590ee44c1495ea67d057e0d21e4ebc25c0e17782 (patch) | |
tree | 8312fab11baeafa3e58093cd2c24aad8e5a53fe5 /rc.sysinit | |
parent | 054e8d38fe9e9cf842600fc23d725617ce3611ce (diff) | |
download | initscripts-590ee44c1495ea67d057e0d21e4ebc25c0e17782.tar.xz |
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 <d@falconindy.com>
Signed-off-by: Tom Gundersen <teg@jklm.no>
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-x | rc.sysinit | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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 |