From 2859d05034ad1445a989c47883888a8d0a3fb7cc Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 12 Dec 2000 08:21:47 +0000
Subject: use modprobe -c to handle possible conditional modules.conf
 constructs (#21283)

---
 rc.d/rc.sysinit | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'rc.d/rc.sysinit')

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=$?
-- 
cgit v1.2.1