aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2000-07-24 19:42:40 +0000
committerBill Nottingham <notting@redhat.com>2000-07-24 19:42:40 +0000
commit8cd59fa2f6ea28c9884a4bda6c354a73dc085337 (patch)
tree169f303c7dcacb50797d669321f75d0bf536814f
parent32b375baeff00c7f8205b6c95b8a6525373bdd97 (diff)
downloadinitscripts-8cd59fa2f6ea28c9884a4bda6c354a73dc085337.tar
initscripts-8cd59fa2f6ea28c9884a4bda6c354a73dc085337.tar.gz
initscripts-8cd59fa2f6ea28c9884a4bda6c354a73dc085337.tar.bz2
initscripts-8cd59fa2f6ea28c9884a4bda6c354a73dc085337.tar.xz
initscripts-8cd59fa2f6ea28c9884a4bda6c354a73dc085337.zip
fix usb ugliness on non-PCI machines
-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 d249db77..18888ab4 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -152,11 +152,11 @@ else
usb=1
modprobe usb-controller 2>/dev/null || usb=0
if [ $usb = "0" ] ; then
- usbpresent=`grep -i usb /proc/pci`
- uhci=`grep -A2 -i usb /proc/pci |grep "I/O at"`
+ usbpresent=`grep -i usb /proc/pci 2>/dev/nill`
+ uhci=`grep -A2 -i usb /proc/pci 2>/dev/null |grep "I/O at"`
# Don't try to initialize disabled USB controllers
- uhciirq=`grep -A1 -i usb /proc/pci |grep "IRQ"`
+ uhciirq=`grep -A1 -i usb /proc/pci 2>/dev/null |grep "IRQ"`
if [ -n "$usbpresent" ]; then
usb=1
if [ -n "$uhci" ] && [ -n "$uhciirq" ] ; then