Drop doslowusb and noslowusb boot parameters.

scandelay=<secs> should be always preferred. Moreover, nowadays
automatically sleeping waiting for USB storage to come up in
the way we were used to do it doesn't work as one expects, because
USB is very common and USB storage devices are very likely to be
present on a system.
Furthermore, the initialization code after setup_slowusb is already
waiting for devices to come up.
cleanup-cruft
Fabio Erculiani 12 years ago
parent 682d0b0d0a
commit ffa5076fd4

@ -72,5 +72,5 @@ DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024"
# Only sections that are in by default or those that
# are not module groups need to be defined here...
HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb lvm dmraid mdadm fs net'
MY_HWOPTS='modules pata sata scsi slowusb usb firewire waitscan dmraid mdadm fs net iscsi crypto'
HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan lvm dmraid mdadm fs net'
MY_HWOPTS='modules pata sata scsi usb firewire waitscan dmraid mdadm fs net iscsi crypto'

@ -446,27 +446,6 @@ prompt_user(){
esac
}
setup_slowusb() {
# This function removes unset DO_slowusb if there is no usb-storage attached.
# If noslowusb is set, skip this function
[ "${DO_slowusb}" ] || return
# Unset DO_slowusb, so we can set it again if usb-storage has something attached
unset DO_slowusb
local usb_storage_dir="/sys/bus/usb/drivers/usb-storage"
if [ ! -d "${usb_storage_dir}" ]
then
# no automated slowusb required. no usb-storage devices attached.
return
fi
for x in "${usb_storage_dir}"/*
do
[ -d "${x}" ] && [ "${x}" != "${usb_storage_dir}/module" ] \
&& { DO_slowusb="1" ; break ; }
done
}
cmdline_hwopts() {
# Scan CMDLINE for any "doscsi" or "noscsi"-type arguments
local FOUND

@ -359,14 +359,8 @@ mdev -s || bad_msg "mdev -s failed"
# Apply scan delay if specified
sdelay
# Setup slow USB bits
setup_slowusb
cd /
# if doslowusb is passed, pause other 10 seconds here, after mdev load
[ "${DO_slowusb}" ] && sleep 10
# Start iSCSI
if [ -e /bin/iscsistart ]
then

@ -472,11 +472,6 @@ which the ramdisk scripts would recognize.
Activate SCSI devices on bootup, necessary when SCSI support is
compiled as modules and you're using SCSI or SATA devices.
*noslowusb*::
By default genkernel pause for 10 seconds if it finds a attached
usb-storage device to give them time to initiate.
This option skips that pause.
*keymap*='MAP'::
Set keymap to 'MAP', e.g. *keymap*=de.
For valid values of 'MAP' please see

Loading…
Cancel
Save