Updated x86-help.msg to make it fall more inline with current genkernel/livecd-tools...

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

diff --git a/ChangeLog b/ChangeLog
index c4e18c82fad839325a333bf15ef49e85f9712443..f19571f895b6e3a164ecdb266e6538aa6455f378 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.105 2004/10/28 15:05:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.106 2004/10/28 18:45:00 wolf31o2 Exp $
+
+  28 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/files/x86-help.msg:
+  Updated x86-help.msg to make it fall more inline with current
+  genkernel/livecd-tools options.
 
   28 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript/x86-archscript.sh, livecd/runscript-support/kmerge.sh,

diff --git a/livecd/files/x86-help.msg b/livecd/files/x86-help.msg
index 512d95aa8c2f5a58c454e376005ef7c15d383eae..db0984d61c19b142d11219c6dba6522da52f56b4 100755 (executable)
--- a/livecd/files/x86-help.msg
+++ b/livecd/files/x86-help.msg
@@ -1,7 +1,6 @@
 Gentoo Linux LiveCD boot options - [F1 to display available kernels]
 
-Many kernel profiles exist on a LiveCD. Please hit F1
-to see the available kernels on this livecd.  Please note that
+Please hit F1 to see the available kernels on this livecd.  Please note that
 the -nofb counterparts to each kernel disable the framebuffer
 and splash images. Additionally, the memtest86 boot option is available
 to test local RAM for errors. To use memtest86, just type 'memtest86'.
@@ -9,18 +8,17 @@ to test local RAM for errors. To use memtest86, just type 'memtest86'.
 Options available to pass to your kernel of choice.
 - agpgart       loads agpgart (use if you have graphic problems,lockups)
 - acpi=on       loads support for ACPI firmware
-- ide=nodma     Force disabling of dma for malfunctioning ide devices
+- ide=nodma     force disabling of DMA for malfunctioning IDE devices
 - doscsi        scan for scsi devices (breaks some ethernet cards)
-- doataraid     loads ide raid modules from initrd
-- dopcmcia      starts pcmcia service
-- doapm         enables apm module load
-- dofirewire    modprobes firewire modules in initrd (for firewire cdroms,etc)
-- dokeymap      enable keymap selection for non-us keyboard layouts
-- docache       Cache the entire runtime portion of cd in ram, allows you
-                               to umount /mnt/cdrom to mount another cdrom.
+- dopcmcia      starts pcmcia service for PCMCIA cdroms
+- nofirewire    disables firewire modules in initrd (for firewire cdroms,etc)
+- nokeymap      disables keymap selection for non-us keyboard layouts
+- docache       cache the entire runtime portion of cd in RAM, allows you
+               to umount /mnt/cdrom to mount another cdrom.
 - nodetect      causes hwsetup/kudzu and hotplug not to run
 - nousb         disables usb module load from initrd, disables hotplug
 - nodhcp        dhcp does not automatically start if nic detected
-- noraid        disables loading of evms modules
 - nohotplug     disables loading hotplug service
-- noapic        disable apic (try if having hardware problems ,nics,scsi,etc)
+- noapic        disable apic (try if having hardware problems nics,scsi,etc)
+- hdx=stroke   allows you to partition the whole harddrive even when your BIOS
+               can't handle large harddrives