Changed dobladecenter to slowusb. Thanks to solar for pointing this out.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1185 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 48b6ad05084c9a525fad9785606d6fb1283556ac..650518426b0050cd14e9301368f309daafe80407 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $
 
+  03 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/files/x86-F3.msg, livecd/files/x86-F4.msg, livecd/files/x86-F5.msg:
+  Changed dobladecenter to slowusb.  Thanks to solar for pointing this out.
+
   03 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py, modules/stage4_target.py:
   Added a check to see if we have the tarball option enabled, which causes

diff --git a/livecd/files/x86-F3.msg b/livecd/files/x86-F3.msg
index 50594ce0a932be81be01b210d045c028aaf20411..e0ec2bd8a24d43241e675394298039d683a66143 100644 (file)
--- a/livecd/files/x86-F3.msg
+++ b/livecd/files/x86-F3.msg
@@ -14,8 +14,9 @@ dmraid=X        This allows for passing options to the device-mapper RAID
                 subsystem.  Options should be encapsulated in quotes.
 doapm           This loads APM driver support.  This requires you to also use
                 acpi=off.
-dobladecenter   This adds some extra pauses into the boot process for the slow
-                USB CDROM of the IBM BladeCenter.
 dopcmcia        This loads support for PCMCIA and Cardbus hardware and also
                 causes the pcmcia cardmgr to be started by the CD on boot.
                 This is only required when booting from PCMCIA/Cardbus devices.
+doscsi          This loads support for most SCSI controllers.  This is also a
+                requirement for booting most USB devices, as they use the SCSI
+                subsystem of the kernel.

diff --git a/livecd/files/x86-F4.msg b/livecd/files/x86-F4.msg
index ae18c853deae955cd3d8895188acf52106216480..77ded0e3cd0cab7c640cbd204aa4abc52ef00332 100644 (file)
--- a/livecd/files/x86-F4.msg
+++ b/livecd/files/x86-F4.msg
@@ -1,7 +1,4 @@
 Hardware options (Page 2):
-doscsi          This loads support for most SCSI controllers.  This is also a
-                requirement for booting most USB devices, as they use the SCSI
-                subsystem of the kernel.
 hda=stroke      This allows you to partition the whole hard disk even when your
                 BIOS is unable to handle large disks.  This option is only used
                 on machines with an older BIOS.  Replace hda with the device

diff --git a/livecd/files/x86-F5.msg b/livecd/files/x86-F5.msg
index 5e54850e4953d310bfa21f3f9c020f4230addd5e..adfb01972b141fb3087a82cba91e9af202a5512c 100644 (file)
--- a/livecd/files/x86-F5.msg
+++ b/livecd/files/x86-F5.msg
@@ -18,3 +18,5 @@ nosound         This disables sound support and volume setting.  This is useful
                 for systems where sound support causes problems.
 nousb           This disables the autoloading of USB modules.  This is useful
                 for debugging USB issues.
+slowusb         This adds some extra pauses into the boot process for slow
+                USB CDROMs, like in the IBM BladeCenter.