Remove "--slowusb" as it is enabled by default. Also document "noslowusb".

diff --git a/ChangeLog b/ChangeLog
index e4127a22f561ffb0ce04993af7dba9eaa9f24ab9..f2b51139660d1240bacd4a1bda9a358bd6c774c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  23 Mar 2011; Peter Hjalmarsson <xake@rymdraket.net> doc/genkernel.8.txt,
+  gen_cmdline.sh, gen_initramfs.sh:
+  Remove "--slowusb" as it is enabled by default now. Also document "noslowusb"
+  ramdisk option that skips it.
+
   22 Mar 2011; Peter Hjalmarsson <xake@rymdraket.net> defaults/initrd.defaults,
   defaults/initrd.scripts:
   Set DO_slowusb as default, and make setup_slowusb unset it if it cannot find

diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt
index a78da11c93d3d2a624fcf7a89f2b548f85d0bada..9091d9561554ba055412400d26a417e7e30ffae0 100644 (file)
--- a/doc/genkernel.8.txt
+++ b/doc/genkernel.8.txt
@@ -263,9 +263,6 @@ INITIALIZATION
 *--iscsi*::
     Include iSCSI support
 
-*--slowusb*::
-    Enables extra pauses for slow USB CD boots.
-
 *--bootloader*=*grub*::
     Add new kernel to GRUB configuration.
 
@@ -427,6 +424,11 @@ 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

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 506ca3f658c52a823033e7d85f6f9dbe55b5be46..9e4009e7efb7599f1d8305b635bfc1b1375bf616 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -84,7 +84,6 @@ longusage() {
   echo "       --dmraid                Include DMRAID support"
   echo "       --multipath             Include Multipath support"
   echo "       --iscsi                 Include iSCSI support"
-  echo "       --slowusb               Enables extra pauses for slow USB CD boots"
   echo "       --bootloader=grub       Add new kernel to GRUB configuration"
   echo "       --linuxrc=<file>        Specifies a user created linuxrc"
   echo "       --busybox-config=<file> Specifies a user created busybox config"
@@ -269,10 +268,6 @@ parse_cmdline() {
                        CMD_REAL_ROOT=`parse_opt "$*"`
                        print_info 2 "CMD_REAL_ROOT: ${CMD_REAL_ROOT}"
                        ;;
-               --slowusb)
-                       CMD_SLOWUSB=1
-                       print_info 2 "CMD_SLOWUSB: ${CMD_SLOWUSB}"
-                       ;;
                --dmraid)
                        if [ ! -e /usr/include/libdevmapper.h ]
                        then

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 2d017fda4b19ff31ac09a0fcaf02c34eb5f2570c..543f48434fd483f3234cd864d42eca9b60997a18 100755 (executable)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -349,7 +349,7 @@ append_mdadm(){
                                cp -a "${MDADM_CONFIG}" "${TEMP}/initramfs-mdadm-temp/etc/mdadm.conf" \
                                || gen_die "Could not copy mdadm.conf!"
                        else
-                               gen_die '${MDADM_CONFIG} does not exist!'
+                               gen_die 'sl${MDADM_CONFIG} does not exist!'
                        fi
                else
                        print_info 1 '          MDADM: Skipping inclusion of mdadm.conf'
@@ -629,10 +629,6 @@ append_auxilary() {
                mkdir -p "${TEMP}/initramfs-aux-temp/lib/keymaps"
                /bin/tar -C "${TEMP}/initramfs-aux-temp/lib/keymaps" -zxf "${GK_SHARE}/defaults/keymaps.tar.gz"
        fi
-       if isTrue $CMD_SLOWUSB
-       then
-               echo 'MY_HWOPTS="${MY_HWOPTS} slowusb"' >> ${TEMP}/initramfs-aux-temp/etc/initrd.defaults
-       fi
 
        cd ${TEMP}/initramfs-aux-temp/sbin && ln -s ../init init
        cd ${TEMP}