From 857b789cca38ed749dd0012382270b888ab5ca34 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 8 Sep 2005 15:11:19 +0000 Subject: [PATCH] Add dobladecenter description to bootloader files for x86/amd64. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@832 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- livecd/files/README.txt | 2 ++ livecd/files/x86-F3.msg | 13 ++++++------- livecd/files/x86-F4.msg | 12 ++++++------ livecd/files/x86-F5.msg | 5 ++++- livecd/files/x86-F6.msg | 6 +++--- livecd/files/x86-F7.msg | 12 ++++++------ 7 files changed, 33 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2dd00c77..cfd9cd3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.324 2005/09/06 21:37:05 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.325 2005/09/08 15:11:19 wolf31o2 Exp $ + + 08 Sep 2005; Chris Gianelloni + livecd/files/README.txt, livecd/files/x86-F3.msg, livecd/files/x86-F4.msg, + livecd/files/x86-F5.msg, livecd/files/x86-F6.msg, livecd/files/x86-F7.msg: + Add dobladecenter description to bootloader files for x86/amd64. 06 Sep 2005; Chris Gianelloni arch/x86.py: Changed pentium-mmx to use -march=pentium-mmx and closing bug #102366. diff --git a/livecd/files/README.txt b/livecd/files/README.txt index 7729a7d1..4ddf8bd9 100644 --- a/livecd/files/README.txt +++ b/livecd/files/README.txt @@ -23,6 +23,8 @@ 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 a PCMCIA/Cardbus device. diff --git a/livecd/files/x86-F3.msg b/livecd/files/x86-F3.msg index b1a1e7b3..50594ce0 100644 --- a/livecd/files/x86-F3.msg +++ b/livecd/files/x86-F3.msg @@ -1,9 +1,9 @@ Hardware options (Page 1): acpi=on This loads support for ACPI and also causes the acpid daemon to be started by the CD on boot. This is only needed if your - system requires ACPI to function properly. This is not required - for Hyperthreading support. -acpi=off Completely disables ACPI. This is useful on some older systems, + system requires ACPI to function properly. This is not + required for Hyperthreading support. +acpi=off Completely disables ACPI. This is useful on some older systems and is also a requirement for using APM. This will disable any Hyperthreading support of your processor. console=X This sets up serial console access for the CD. The first @@ -14,9 +14,8 @@ 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 a PCMCIA/Cardbus device. -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. + This is only required when booting from PCMCIA/Cardbus devices. diff --git a/livecd/files/x86-F4.msg b/livecd/files/x86-F4.msg index feb2a102..ae18c853 100644 --- a/livecd/files/x86-F4.msg +++ b/livecd/files/x86-F4.msg @@ -1,4 +1,7 @@ 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 @@ -11,13 +14,10 @@ ide=nodma This forces the disabling of DMA in the kernel and is required noapic This disables the Advanced Programmable Interrupt Controller that is present on newer motherboards. It has been known to cause some problems on older hardware. -nodetect This disables all of the autodetection done by the CD, including - device autodetection and DHCP probing. This is useful for doing - debugging of a failing CD or driver. +nodetect This disables all of the autodetection done by the CD, + including device autodetection and DHCP probing. This is + useful for doing debugging of a failing CD or driver. nodhcp This disables DHCP probing on detected network cards. This is useful on networks with only static addresses. nodmraid Disables support for device-mapper RAID, such as that used for on-board IDE/SATA RAID controllers. -nofirewire This disables the loading of Firewire modules. This should only - be necessary if your Firewire hardware is causing a problem with - booting the CD. diff --git a/livecd/files/x86-F5.msg b/livecd/files/x86-F5.msg index 654076e5..5e54850e 100644 --- a/livecd/files/x86-F5.msg +++ b/livecd/files/x86-F5.msg @@ -1,4 +1,7 @@ Hardware options (Page 3): +nofirewire This disables the loading of Firewire modules. This should + only be necessary if your Firewire hardware is causing + a problem with booting the CD. nogpm This diables gpm console mouse support. nohotplug This disables the loading of the hotplug and coldplug init scripts at boot. This is useful for doing debugging of a @@ -6,7 +9,7 @@ nohotplug This disables the loading of the hotplug and coldplug init nokeymap This disables the keymap selection used to select non-US keyboard layouts. nolapic This disables the local APIC on Uniprocessor kernels. -nosata This disables the loading of Serial ATA modules. This is useful +nosata This disables the loading of Serial ATA modules. This is used if your system is having problems with the SATA subsystem. nosmp This disables SMP, or Symmetric Multiprocessing, on SMP-enabled kernels. This is useful for debugging SMP-related issues with diff --git a/livecd/files/x86-F6.msg b/livecd/files/x86-F6.msg index 19478c8a..c9f77224 100644 --- a/livecd/files/x86-F6.msg +++ b/livecd/files/x86-F6.msg @@ -7,9 +7,9 @@ doevms2 This enables support for IBM's pluggable EVMS, or Enterprise Volume Management System. This is not safe to use with lvm2. dolvm2 This enables support for Linux's Logical Volume Management. This is not safe to use with evms2. -noudev This disables udev support on 2.6 kernels. This option requires - that dodevfs is used. Since udev is not an option for 2.4 - kernels, this options has no effect if booting a 2.4 kernel. +noudev This disables udev support on 2.6 kernels. This option + requires that dodevfs is used. Since udev is not an option for + 2.4 kernels, this options has no effect if booting 2.4 kernels. unionfs Enables support for Unionfs on supported CD images. This will create a writable Unionfs overlay in a tmpfs, allowing you to change any file on the CD. diff --git a/livecd/files/x86-F7.msg b/livecd/files/x86-F7.msg index 7c14e978..82306245 100644 --- a/livecd/files/x86-F7.msg +++ b/livecd/files/x86-F7.msg @@ -1,13 +1,13 @@ Other options: debug Enables debugging code. This might get messy, as it displays a lot of data to the screen. -docache This caches the entire runtime portion of the CD into RAM, which - allows you to umount /mnt/cdrom and mount another CDROM. This - option requires that you have at least twice as much available - RAM as the size of the CD. +docache This caches the entire runtime portion of the CD into RAM, + which allows you to umount /mnt/cdrom and mount another CDROM. + This option requires that you have at least twice as much + available RAM as the size of the CD. doload=X This causes the initial ramdisk to load any module listed, as - well as dependencies. Replace X with the module name. Multiple - modules can be specified by a comma-separated list. + well as dependencies. Replace X with the module name. + Multiple modules can be specified by a comma-separated list. noload=X This causes the initial ramdisk to skip the loading of a specific module that may be causing a problem. Syntax matches that of doload. -- 2.26.2