From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 49F321381F3 for ; Thu, 25 Apr 2013 06:22:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98E23E0998; Thu, 25 Apr 2013 06:22:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 16049E0998 for ; Thu, 25 Apr 2013 06:22:35 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0539133DBE6 for ; Thu, 25 Apr 2013 06:22:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 59D68E4406 for ; Thu, 25 Apr 2013 06:22:31 +0000 (UTC) From: "Fabio Erculiani" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabio Erculiani" Message-ID: <1366874452.ffa5076fd4681e6b65968b826b84a66fabcd75f6.lxnay@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: doc/, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.defaults defaults/initrd.scripts defaults/linuxrc doc/genkernel.8.txt X-VCS-Directories: doc/ defaults/ X-VCS-Committer: lxnay X-VCS-Committer-Name: Fabio Erculiani X-VCS-Revision: ffa5076fd4681e6b65968b826b84a66fabcd75f6 X-VCS-Branch: master Date: Thu, 25 Apr 2013 06:22:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7990c4e8-dc9c-4aa9-82c7-c63c74291abf X-Archives-Hash: 3665ec701c6286d54730899b1906891b commit: ffa5076fd4681e6b65968b826b84a66fabcd75f6 Author: Fabio Erculiani sabayon org> AuthorDate: Tue Apr 23 16:12:46 2013 +0000 Commit: Fabio Erculiani gentoo org> CommitDate: Thu Apr 25 07:20:52 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ffa5076f Drop doslowusb and noslowusb boot parameters. scandelay= 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. --- defaults/initrd.defaults | 4 ++-- defaults/initrd.scripts | 21 --------------------- defaults/linuxrc | 6 ------ doc/genkernel.8.txt | 5 ----- 4 files changed, 2 insertions(+), 34 deletions(-) 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