diff options
author | Tobias Powalowski <tpowa@archlinux.org> | 2005-11-21 08:52:49 +0000 |
---|---|---|
committer | Tobias Powalowski <tpowa@archlinux.org> | 2005-11-21 08:52:49 +0000 |
commit | fca87ebae05b19c0da51c1b996f4bddad82c3115 (patch) | |
tree | 4e9aca56ec0456b066abf51dae44372977b0c92a /rc.sysinit | |
parent | d7695ef38916be8e806b84f8e195a45a7b2ec217 (diff) | |
download | initscripts-fca87ebae05b19c0da51c1b996f4bddad82c3115.tar.xz |
'upgpkg: hwdetect fixed module order, added load_modules=off to rc.sysinit'
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-x | rc.sysinit | 22 |
1 files changed, 12 insertions, 10 deletions
@@ -236,18 +236,20 @@ fi [ "`grep usbfs /proc/filesystems`" ] && mount -t usbfs none /proc/bus/usb # Load modules from the MODULES array defined in rc.conf -if [ -f /proc/modules ]; then - stat_busy "Loading Modules" - for mod in "${MODULES[@]}"; do - if [ "$mod" = "${mod#!}" ]; then - /sbin/modprobe $mod +if ! [ "$load_modules" = "off" ]; then + if [ -f /proc/modules ]; then + stat_busy "Loading Modules" + for mod in "${MODULES[@]}"; do + if [ "$mod" = "${mod#!}" ]; then + /sbin/modprobe $mod + fi + done + if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then + export BLACKLIST="${MOD_BLACKLIST[*]}" + /sbin/hwdetect -load-modules fi - done - if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then - export BLACKLIST="${MOD_BLACKLIST[*]}" - /sbin/hwdetect -load-modules + stat_done fi - stat_done fi # Screen blanks after 15 minutes idle time |