diff options
| author | Bill Nottingham <notting@redhat.com> | 2001-02-27 23:10:55 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2001-02-27 23:10:55 +0000 |
| commit | 02575b13f552d1816c5248174170e2d8bf4c178f (patch) | |
| tree | 39e2dead1728de82f137c5560e3e4d9589ae007f | |
| parent | eaddf46af84a9683a41a3c3cd930ccf987c0f61a (diff) | |
| download | initscripts-02575b13f552d1816c5248174170e2d8bf4c178f.tar initscripts-02575b13f552d1816c5248174170e2d8bf4c178f.tar.gz initscripts-02575b13f552d1816c5248174170e2d8bf4c178f.tar.bz2 initscripts-02575b13f552d1816c5248174170e2d8bf4c178f.tar.xz initscripts-02575b13f552d1816c5248174170e2d8bf4c178f.zip | |
mount usbdevfs before loading host controller module, don't explicitly load usb-storage
| -rwxr-xr-x | rc.d/rc.sysinit | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index a6a781ac..9e5a63cf 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -156,6 +156,8 @@ usb=0 if ! grep -iq "nousb" /proc/cmdline 2>/dev/null && ! grep -q "usb" /proc/devices 2>/dev/null ; then alias=`/sbin/modprobe -c | egrep -s "^alias[[:space:]]+usb-controller" | awk '{ print $3 }'` if [ -n "$alias" -a "$alias" != "off" ] ; then + modprobe usbcore + action $"Mounting USB filesystem: " mount -t usbdevfs usbdevfs /proc/bus/usb action $"Initializing USB controller ($alias): " modprobe $alias [ $? -eq 0 ] && usb=1 fi @@ -165,13 +167,10 @@ if ! grep -iq "nousb" /proc/cmdline 2>/dev/null && grep -q "usb" /proc/devices 2 usb=1 fi -needusbstorage= if [ $usb = "1" ]; then sleep 5 - action $"Mounting USB filesystem: " mount -t usbdevfs usbdevfs /proc/bus/usb 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"` - needusbstorage=`cat /proc/bus/usb/devices | grep -e "^I.*Cls=08.*"` if [ -n "$kbdoutput" ] || [ -n "$mouseoutput" ]; then action $"Initializing USB HID interface: " modprobe hid 2> /dev/null fi @@ -603,11 +602,6 @@ if [ -f /proc/scsi/scsi ] && grep -q 'Type: Sequential-Access' /proc/scsi/scsi fi fi -# Load usb storage here, to match most other things -if [ -n "$needusbstorage" ]; then - modprobe usb-storage >/dev/null 2>&1 -fi - # If they asked for ide-scsi, load it if grep -q "ide-scsi" /proc/cmdline ; then modprobe ide-cd >/dev/null 2>&1 |