Attachment #266839 for bug #359619

Lines 5-10 Link Here

(-)a/ChangeLog (+7 lines)
5	# Distributed under the GPL v2	5	# Distributed under the GPL v2
6	# $Id$	6	# $Id$
7		7
		8	22 Mar 2011; Peter Hjalmarsson <xake@rymdraket.net> defaults/initrd.defaults,
		9	defaults/initrd.scripts:
		10	Set DO_slowusb as default, and make setup_slowusb unset it if it cannot find
		11	a usb-storage attached. This makes genkernel ramdisk adhere to "noslowusb",
		12	makes the ramdisk only wait if there is a usb-storage attached and should fix
		13	gentoo bug #359619.
		14
8	16 Mar 2011; Sebastian Pipping <sping@gentoo.org> genkernel:	15	16 Mar 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
9	Bump version to 3.4.14	16	Bump version to 3.4.14
10		17

Lines 80-83 DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024" Link Here

(-)a/defaults/initrd.defaults (-1 / +1 lines)
80	# Only sections that are in by default or those that	80	# Only sections that are in by default or those that
81	# are not module groups need to be defined here...	81	# are not module groups need to be defined here...
82	HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb evms lvm dmraid mdadm fs net'	82	HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb evms lvm dmraid mdadm fs net'
83	MY_HWOPTS='modules pata sata scsi usb firewire waitscan dmraid mdadm fs net iscsi'	83	MY_HWOPTS='modules pata sata scsi slowusb usb firewire waitscan dmraid mdadm fs net iscsi'




}

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}" ]
- 

Return to bug 359619

Lines 419-429 setup_hotplug() { Link Here

(-)a/defaults/initrd.scripts (-6 / +6 lines)
419	}	419	}
420		420
421	setup_slowusb() {	421	setup_slowusb() {
422	# slowusb already set?	422	# This function removes unset DO_slowusb if there is no usb-storage attached.
423	if [ "${DO_slowusb}" = "1" ]	423	# If noslowusb is set, skip this function
424	then	424	[ "${DO_slowusb}" ] \|\| return
425	return	425
426	fi	426	# Unset DO_slowusb, so we can set it again if usb-storage has something attached
		427	unset DO_slowusb
427		428
428	local usb_storage_dir="/sys/bus/usb/drivers/usb-storage"	429	local usb_storage_dir="/sys/bus/usb/drivers/usb-storage"
429	if [ ! -d "${usb_storage_dir}" ]	430	if [ ! -d "${usb_storage_dir}" ]
430	-