diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults index e70beab..cbf18f3 100755 --- a/defaults/initrd.defaults +++ b/defaults/initrd.defaults @@ -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' diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index abd8fad..a216b84 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -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 diff --git a/defaults/linuxrc b/defaults/linuxrc index 805515b..ba9c5d5 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -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 diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt index 86d7d53..54d26d2 100644 --- a/doc/genkernel.8.txt +++ b/doc/genkernel.8.txt @@ -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