1 |
commit: ffa5076fd4681e6b65968b826b84a66fabcd75f6 |
2 |
Author: Fabio Erculiani <lxnay <AT> sabayon <DOT> org> |
3 |
AuthorDate: Tue Apr 23 16:12:46 2013 +0000 |
4 |
Commit: Richard Yao <ryao <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 25 07:20:52 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=ffa5076f |
7 |
|
8 |
Drop doslowusb and noslowusb boot parameters. |
9 |
|
10 |
scandelay=<secs> should be always preferred. Moreover, nowadays |
11 |
automatically sleeping waiting for USB storage to come up in |
12 |
the way we were used to do it doesn't work as one expects, because |
13 |
USB is very common and USB storage devices are very likely to be |
14 |
present on a system. |
15 |
Furthermore, the initialization code after setup_slowusb is already |
16 |
waiting for devices to come up. |
17 |
|
18 |
--- |
19 |
defaults/initrd.defaults | 4 ++-- |
20 |
defaults/initrd.scripts | 21 --------------------- |
21 |
defaults/linuxrc | 6 ------ |
22 |
doc/genkernel.8.txt | 5 ----- |
23 |
4 files changed, 2 insertions(+), 34 deletions(-) |
24 |
|
25 |
diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults |
26 |
index e70beab..cbf18f3 100755 |
27 |
--- a/defaults/initrd.defaults |
28 |
+++ b/defaults/initrd.defaults |
29 |
@@ -72,5 +72,5 @@ DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024" |
30 |
|
31 |
# Only sections that are in by default or those that |
32 |
# are not module groups need to be defined here... |
33 |
-HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan slowusb lvm dmraid mdadm fs net' |
34 |
-MY_HWOPTS='modules pata sata scsi slowusb usb firewire waitscan dmraid mdadm fs net iscsi crypto' |
35 |
+HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan lvm dmraid mdadm fs net' |
36 |
+MY_HWOPTS='modules pata sata scsi usb firewire waitscan dmraid mdadm fs net iscsi crypto' |
37 |
|
38 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
39 |
index abd8fad..a216b84 100755 |
40 |
--- a/defaults/initrd.scripts |
41 |
+++ b/defaults/initrd.scripts |
42 |
@@ -446,27 +446,6 @@ prompt_user(){ |
43 |
esac |
44 |
} |
45 |
|
46 |
-setup_slowusb() { |
47 |
- # This function removes unset DO_slowusb if there is no usb-storage attached. |
48 |
- # If noslowusb is set, skip this function |
49 |
- [ "${DO_slowusb}" ] || return |
50 |
- |
51 |
- # Unset DO_slowusb, so we can set it again if usb-storage has something attached |
52 |
- unset DO_slowusb |
53 |
- |
54 |
- local usb_storage_dir="/sys/bus/usb/drivers/usb-storage" |
55 |
- if [ ! -d "${usb_storage_dir}" ] |
56 |
- then |
57 |
- # no automated slowusb required. no usb-storage devices attached. |
58 |
- return |
59 |
- fi |
60 |
- for x in "${usb_storage_dir}"/* |
61 |
- do |
62 |
- [ -d "${x}" ] && [ "${x}" != "${usb_storage_dir}/module" ] \ |
63 |
- && { DO_slowusb="1" ; break ; } |
64 |
- done |
65 |
-} |
66 |
- |
67 |
cmdline_hwopts() { |
68 |
# Scan CMDLINE for any "doscsi" or "noscsi"-type arguments |
69 |
local FOUND |
70 |
|
71 |
diff --git a/defaults/linuxrc b/defaults/linuxrc |
72 |
index 805515b..ba9c5d5 100755 |
73 |
--- a/defaults/linuxrc |
74 |
+++ b/defaults/linuxrc |
75 |
@@ -359,14 +359,8 @@ mdev -s || bad_msg "mdev -s failed" |
76 |
# Apply scan delay if specified |
77 |
sdelay |
78 |
|
79 |
-# Setup slow USB bits |
80 |
-setup_slowusb |
81 |
- |
82 |
cd / |
83 |
|
84 |
-# if doslowusb is passed, pause other 10 seconds here, after mdev load |
85 |
-[ "${DO_slowusb}" ] && sleep 10 |
86 |
- |
87 |
# Start iSCSI |
88 |
if [ -e /bin/iscsistart ] |
89 |
then |
90 |
|
91 |
diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt |
92 |
index 86d7d53..54d26d2 100644 |
93 |
--- a/doc/genkernel.8.txt |
94 |
+++ b/doc/genkernel.8.txt |
95 |
@@ -472,11 +472,6 @@ which the ramdisk scripts would recognize. |
96 |
Activate SCSI devices on bootup, necessary when SCSI support is |
97 |
compiled as modules and you're using SCSI or SATA devices. |
98 |
|
99 |
-*noslowusb*:: |
100 |
- By default genkernel pause for 10 seconds if it finds a attached |
101 |
- usb-storage device to give them time to initiate. |
102 |
- This option skips that pause. |
103 |
- |
104 |
*keymap*='MAP':: |
105 |
Set keymap to 'MAP', e.g. *keymap*=de. |
106 |
For valid values of 'MAP' please see |