aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2001-03-08 03:16:46 +0000
committerBill Nottingham <notting@redhat.com>2001-03-08 03:16:46 +0000
commitfce030f14b119c69682b7b36875fc5880f1e2322 (patch)
treef9544ffdc5e3538d07ff248da6be72066941754f /rc.d
parent7b2648843bf072cdec62bd5cf032ba0f33625810 (diff)
downloadinitscripts-fce030f14b119c69682b7b36875fc5880f1e2322.tar
initscripts-fce030f14b119c69682b7b36875fc5880f1e2322.tar.gz
initscripts-fce030f14b119c69682b7b36875fc5880f1e2322.tar.bz2
initscripts-fce030f14b119c69682b7b36875fc5880f1e2322.tar.xz
initscripts-fce030f14b119c69682b7b36875fc5880f1e2322.zip
avoid some error messages from USB startup (#31040)
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 88a47cea..699c1b10 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -161,7 +161,7 @@ if ! grep -iq "nousb" /proc/cmdline 2>/dev/null && ! grep -q "usb" /proc/devices
for alias in $aliases ; do
action $"Initializing USB controller ($alias): " modprobe $alias
done
- [ $? -eq 0 ] && usb=1
+ [ $? -eq 0 -a -n "$aliases" ] && usb=1
fi
fi
@@ -171,8 +171,8 @@ fi
if [ $usb = "1" ]; then
sleep 5
- mouseoutput=`cat /proc/bus/usb/devices|grep -E "^I.*Cls=03.*Prot=02"`
- kbdoutput=`cat /proc/bus/usb/devices|grep -E "^I.*Cls=03.*Prot=01"`
+ mouseoutput=`cat /proc/bus/usb/devices 2>/dev/null|grep -E "^I.*Cls=03.*Prot=02"`
+ kbdoutput=`cat /proc/bus/usb/devices 2>/dev/null|grep -E "^I.*Cls=03.*Prot=01"`
if [ -n "$kbdoutput" ] || [ -n "$mouseoutput" ]; then
action $"Initializing USB HID interface: " modprobe hid 2> /dev/null
fi