dobladecenter->slowusb

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@372 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 81c2183c4992bdad1c5557642e129a5fc6035a49..48192711daf2eb5dbdd03fc31f0468a5440cb665 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -74,7 +74,7 @@ longusage() {
   echo "       --lvm2                  Include LVM2 support"
 #  echo "      --unionfs               Include UNIONFS support"
   echo "       --dmraid                Include DMRAID support"
-  echo "       --bladecenter   Enables extra pauses for IBM Bladecenter CD boots"
+  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 "       --disklabel             Include disk label and uuid support in your initrd"
@@ -216,9 +216,9 @@ parse_cmdline() {
                      CMD_NO_BUSYBOX=1
                      print_info 2 "CMD_NO_BUSYBOX: $CMD_NO_BUSYBOX"
              ;;
-             --bladecenter)
-                     CMD_BLADECENTER=1
-                     print_info 2 "CMD_BLADECENTER: $CMD_BLADECENTER"
+             --slowusb)
+                     CMD_SLOWUSB=1
+                     print_info 2 "CMD_SLOWUSB: $CMD_SLOWUSB"
              ;;
              --dmraid)
                      if [ ! -e /usr/include/libdevmapper.h ]

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 88a3bbf3b570bbcb8548d84a2b79d886eadec02d..e37631346707c8b068935e87b7ccbf36f5cbcb47 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -419,9 +419,9 @@ create_initramfs_aux() {
        fi
        mkdir -p "${TEMP}/initramfs-aux-temp/lib/keymaps"
        /bin/tar -C "${TEMP}/initramfs-aux-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz"
-       if isTrue $CMD_BLADECENTER
+       if isTrue $CMD_SLOWUSB
        then
-               echo 'MY_HWOPTS="${MY_HWOPTS} bladecenter"' >> ${TEMP}/initramfs-aux-temp/etc/initrd.defaults
+               echo 'MY_HWOPTS="${MY_HWOPTS} slowusb"' >> ${TEMP}/initramfs-aux-temp/etc/initrd.defaults
        fi
 
        cd ${TEMP}/initramfs-aux-temp/sbin && ln -s ../init init

diff --git a/gen_initrd.sh b/gen_initrd.sh
index 90e859047da6a9a3c32186a070502745fe734d0a..4649c932c16f7fed1ab56f10c493f704022002bb 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -311,9 +311,9 @@ create_initrd_aux() {
        fi
        mkdir -p "${TEMP}/initrd-temp/lib/keymaps"
        /bin/tar -C "${TEMP}/initrd-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz"
-       if isTrue $CMD_BLADECENTER
+       if isTrue $CMD_SLOWUSB
        then
-               echo 'MY_HWOPTS="${MY_HWOPTS} bladecenter"' >> ${TEMP}/initrd-temp/etc/initrd.defaults
+               echo 'MY_HWOPTS="${MY_HWOPTS} slowusb"' >> ${TEMP}/initrd-temp/etc/initrd.defaults
        fi
 
        cd ${TEMP}/initrd-temp/sbin && ln -s ../linuxrc init

diff --git a/generic/initrd.defaults b/generic/initrd.defaults
index f7f323b274080a8dd7edbfedba62538538329efd..391602622e45db826feb3e1faaa7438e872e3cad 100644 (file)
--- a/generic/initrd.defaults
+++ b/generic/initrd.defaults
@@ -78,5 +78,5 @@ CONSOLE="/dev/console"
 
 # Only sections that are in by default or those that
 # are not module groups need to be defined here...
-HWOPTS='usb firewire keymap cache evms2 sata lvm2 dmraid bladecenter'
+HWOPTS='usb firewire keymap cache evms2 sata lvm2 dmraid slowusb'
 MY_HWOPTS='usb firewire sata dmraid'

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 73fbe3fb42bc5d7f9a402f255960a0e8c18dec3d..56503060456df54374e1dc34d802ca0fc4e3128d 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -275,11 +275,11 @@ start_dev_mgr(){
     if [ "${USE_UDEV_NORMAL}" -eq '1' ]
     then
                cd /sys
-               [ "${DO_bladecenter}" ] && sleep 10
+               [ "${DO_slowusb}" ] && sleep 10
                kill_devfsd
                good_msg 'Activating udev'
                runUdev
-               [ "${DO_bladecenter}" ] && sleep 20
+               [ "${DO_slowusb}" ] && sleep 20
                cd /
     else
                if [ ! -e /dev/.devfsd ]

diff --git a/generic/linuxrc b/generic/linuxrc
index 7e3fadf2781ea0ba135ac885046f58c3df06e69d..0d2bdfd45bacd9edfe406cfaff6dcf3ab9344782 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -612,7 +612,7 @@ then
                        fi
                done
 
-               [ "${DO_bladecenter}" ] && sleep 10
+               [ "${DO_slowusb}" ] && sleep 10
                mkdir initrd proc tmp sys 2>/dev/null
                chmod 1777 tmp
        fi
@@ -627,7 +627,7 @@ then
        # Let Init scripts know that we booted from CD
        export CDBOOT
        CDBOOT=1
-       [ "${DO_bladecenter}" ] && sleep 10
+       [ "${DO_slowusb}" ] && sleep 10
 else
        mkdir -p ${NEW_ROOT}/tmp/.initrd
 fi
@@ -651,7 +651,7 @@ then
        cd ${CHROOT}
        mkdir ${CHROOT}/proc ${CHROOT}/sys 2>/dev/null
        pivot_root . tmp/.initrd
-       [ "${DO_bladecenter}" ] && sleep 10
+       [ "${DO_slowusb}" ] && sleep 10
        echo -n '.'
 
        if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ]