From 0688f6ed2ede5ca3929eee2c0b9af3fab89782d1 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 16 Apr 2004 07:45:46 +0000
Subject: fix usb loading (#120911)

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

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 717d1002..7300a7ad 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -194,20 +194,15 @@ fi
 update_boot_stage RCusb
 usb=0
 if ! strstr "$cmdline" nousb && ! strstr "$cmdline" nomodules ; then
-  if ! LC_ALL=C fgrep -q "usb" /proc/devices 2>/dev/null ; then
     aliases=`/sbin/modprobe -c | awk '/^alias usb-controller/ { print $3 }'`
     if [ -n "$aliases" -a "$aliases" != "off" ]; then
-      modprobe usbcore
+      modprobe usbcore >/dev/null 2>&1
       for alias in $aliases ; do 
       	[ "$alias" = "off" ] && continue
 	action $"Initializing USB controller ($alias): " modprobe $alias
       done
       [ $? -eq 0 -a -n "$aliases" ] && usb=1
     fi
-  fi
-  if LC_ALL=C fgrep -q "usb" /proc/devices 2>/dev/null ; then
-    usb=1
-  fi
 fi
 
 if [ $usb = 1 -a ! -f /proc/bus/usb/devices ]; then
-- 
cgit