From da0a76e458759bf96feccb25e28ee7f627ee7218 Mon Sep 17 00:00:00 2001
From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Thu, 13 Apr 2006 13:21:10 +0000
Subject: [PATCH] dobladecenter->slowusb

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@372 67a159dc-881f-0410-a524-ba9dfbe2cb84
---
 gen_cmdline.sh          | 8 ++++----
 gen_initramfs.sh        | 4 ++--
 gen_initrd.sh           | 4 ++--
 generic/initrd.defaults | 2 +-
 generic/initrd.scripts  | 4 ++--
 generic/linuxrc         | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 81c2183..4819271 100755
--- 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 88a3bbf..e376313 100644
--- 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 90e8590..4649c93 100644
--- 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 f7f323b..3916026 100644
--- 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 73fbe3f..5650306 100644
--- 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 7e3fadf..0d2bdfd 100644
--- 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' ]
-- 
2.26.2