Added --bladecenter for slow USB CD on IBM BladeCenter.

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

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 889c5618f4263201de14a0a30f0065623b0df6df..53f92298a6c88a1b1e9c46dfd7cd4a0071beaf23 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -69,6 +69,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 "       --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"
@@ -201,6 +202,10 @@ 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"
+                 ;;
              --dmraid)
                      CMD_DMRAID=1
                      print_info 2 "CMD_DMRAID: $CMD_DMRAID"

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 32f916ce91714a5408c905bbe1abf0dbb7a1a840..34a9de870a5905306900b51737caab40f53c606e 100644 (file)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -387,6 +387,13 @@ determine_real_args() {
        else
                BUSYBOX=1
        fi
+
+       if isTrue "${CMD_BLADECENTER}"
+       then
+               BLADECENTER=1
+       else
+               BLADECENTER=0
+       fi
        
        if isTrue "${CMD_DMRAID}"
        then

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 730c80382e880a84cab38a6c2169a9b9236c50c2..54f9986421cd66f1e63906227a15f53aae9e8575 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -257,25 +257,27 @@ start_dev_mgr(){
     # Check udev is available...
     if [ "${KV_2_6_OR_GREATER}" -a ! "${USE_UDEV_NORMAL}" -eq '0' -a -x /sbin/udev ]
     then
-       USE_UDEV_NORMAL=1
+               USE_UDEV_NORMAL=1
     else
-       USE_UDEV_NORMAL=0
+               USE_UDEV_NORMAL=0
     fi
 
     if [ "${USE_UDEV_NORMAL}" -eq '1' ]
     then
-       cd /sys
-       kill_devfsd
-       good_msg 'Activating udev'
-       runUdev
-       cd /
+               cd /sys
+               [ "${BLADECENTER}" -eq "1" ] && sleep 10
+               kill_devfsd
+               good_msg 'Activating udev'
+               runUdev
+               [ "${BLADECENTER}" -eq "1" ] && sleep 20
+               cd /
     else
-       if [ ! -e /dev/.devfsd ]
-       then
-           good_msg 'Activating devfs'
-           mount -t devfs devfs /dev
-           devfsd /dev -np
-       fi
+               if [ ! -e /dev/.devfsd ]
+               then
+                   good_msg 'Activating devfs'
+                       mount -t devfs devfs /dev
+                       devfsd /dev -np
+               fi
     fi
 }
 

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