aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2000-12-12 08:21:47 +0000
committerBill Nottingham <notting@redhat.com>2000-12-12 08:21:47 +0000
commit2859d05034ad1445a989c47883888a8d0a3fb7cc (patch)
tree48f2b98f715ce9ce599478d8c77cd623cce3eb6e /rc.d
parentdd8b94c9e763c4c04015a9f0c87001e61686ee8b (diff)
downloadinitscripts-2859d05034ad1445a989c47883888a8d0a3fb7cc.tar
initscripts-2859d05034ad1445a989c47883888a8d0a3fb7cc.tar.gz
initscripts-2859d05034ad1445a989c47883888a8d0a3fb7cc.tar.bz2
initscripts-2859d05034ad1445a989c47883888a8d0a3fb7cc.tar.xz
initscripts-2859d05034ad1445a989c47883888a8d0a3fb7cc.zip
use modprobe -c to handle possible conditional modules.conf constructs (#21283)
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/rc.sysinit6
1 files changed, 3 insertions, 3 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index a8090c64..30124250 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -152,7 +152,7 @@ action "Setting hostname ${HOSTNAME}: " hostname ${HOSTNAME}
# Initialize USB controller and HID devices
usb=0
if ! grep -iq "nousb" /proc/cmdline 2>/dev/null && ! grep -q "usb" /proc/devices 2>/dev/null ; then
- alias=`egrep -s "^alias[[:space:]]+usb-controller[[:space:]]+" /etc/modules.conf | awk '{ print $3 }'`
+ alias=`/sbin/modprobe -c | egrep -s "^alias[[:space:]]+usb-controller[[:space:]]+" | awk '{ print $3 }'`
if [ -n "$alias" -a "$alias" != "off" ] ; then
action "Initializing USB controller ($alias): " modprobe $alias
[ $? -eq 0 ] && usb=1
@@ -357,12 +357,12 @@ fi
# Load sound modules iff they need persistent DMA buffers
if grep -q "options sound dmabuf=1" /etc/modules.conf 2>/dev/null ; then
RETURN=0
- alias=`egrep -s "^alias[[:space:]]+sound[[:space:]]+" /etc/modules.conf | awk '{ print $3 }'`
+ alias=`/sbin/modprobe -c | egrep -s "^alias[[:space:]]+sound[[:space:]]+" | awk '{ print $3 }'`
if [ -n "$alias" -a "$alias" != "off" ] ; then
action "Loading sound module ($alias): " modprobe $alias
RETURN=$?
fi
- alias=`egrep -s "^alias[[:space:]]+sound-slot-0[[:space:]]+" /etc/modules.conf | awk '{ print $3 }'`
+ alias=`/sbin/modprobe -c | egrep -s "^alias[[:space:]]+sound-slot-0[[:space:]]+" | awk '{ print $3 }'`
if [ -n "$alias" -a "$alias" != "off" ] ; then
action "Loading sound module ($alias): " modprobe $alias
RETURN=$?