2006-02-02 Jeremy Katz <katzj@redhat.com>

	* bootdisk/i386/boot.msg: Update to fix colors (#178033) and to be
	more accurate.
	* bootdisk/i386/general.msg: Likewise
	* bootdisk/i386/options.msg: Likewise
	* bootdisk/i386/params.msg: Likewise
	* bootdisk/i386/rescue.msg: Likewise
	* bootdisk/i386/syslinux.cfg: Update options
	* bootdisk/x86_64/boot.msg: Likewise
	* bootdisk/x86_64/general.msg: Likewise
	* bootdisk/x86_64/options.msg: Likewise
	* bootdisk/x86_64/params.msg: Likewise
	* bootdisk/x86_64/rescue.msg: Likewise
	* bootdisk/x86_64/syslinux.cfg: Update options

7 files changed, 30 insertions, 69 deletions

diff --git a/bootdisk/i386/boot.msg b/bootdisk/i386/boot.msg
index 4237670c0..deac636c5 100644
--- a/bootdisk/i386/boot.msg
+++ b/bootdisk/i386/boot.msg
@@ -1,10 +1,10 @@
  
 splash.lss
 
- -  To install or upgrade in graphical mode, press the 0f<ENTER>07 key.
+ -  To install or upgrade in graphical mode, press the 01<ENTER>07 key.
 
- -  To install or upgrade in text mode, type: 0flinux text <ENTER>07.
+ -  To install or upgrade in text mode, type: 01linux text <ENTER>07.
 
  -  Use the function keys listed below for more information.
 
-02[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
+0f[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
diff --git a/bootdisk/i386/general.msg b/bootdisk/i386/general.msg
index bda4f3256..c5a25fc32 100644
--- a/bootdisk/i386/general.msg
+++ b/bootdisk/i386/general.msg
@@ -1,17 +1,15 @@
 00
 
 
-                        09General Boot Help07
+                        01General Boot Help07
 
 You are now ready to begin the installation process.  In most cases, 
-the best way to get started is to simply press the 0f<ENTER>07 key.
+the best way to get started is to simply press the 01<ENTER>07 key.
 
 If you are having problems with the graphical installer, you can use the 
-'0fresolution=<width>x<height>07' option to try and force a
+'01resolution=<width>x<height>07' option to try and force a
 particular resolution. For example, boot with 
-'0flinux resolution=1024x76807'.  If you have problems with 
-displaying before the graphical environment starts,
-try booting with '0flinux nofb07'.
+'01linux resolution=1024x76807'.  
 
 Certain hardware configurations may have trouble with the automatic hardware
 detection done during the installation.  If you experience problems during the 
@@ -19,8 +17,8 @@ installation, restart the installation adding the 'noprobe' option.  The
 'skipddc' option will also skip monitor probing which hangs some systems.
 
 There are a number of parameters that can be passed to the Linux kernel
-at boot time.  Press 0f<F4>07 for more information. 
+at boot time.  Press 01<F4>07 for more information. 
 
 
-02[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
+0f[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
 
diff --git a/bootdisk/i386/options.msg b/bootdisk/i386/options.msg
index 8fe6422eb..8ef5497b0 100644
--- a/bootdisk/i386/options.msg
+++ b/bootdisk/i386/options.msg
@@ -1,23 +1,23 @@
 00
  
 
-                       09Installer Boot Options07
+                       01Installer Boot Options07
 
- -  To disable hardware probing, type: 0flinux noprobe <ENTER>07.  
+ -  To disable hardware probing, type: 01linux noprobe <ENTER>07.  
 
- -  To test the install media you are using, type: 0flinux mediacheck <ENTER>07.  
+ -  To test the install media you are using, type: 01linux mediacheck <ENTER>07.  
 
- -  To enable rescue mode, type: 0flinux rescue <ENTER>07.  
-    Press 0f<F5>07 for more information about rescue mode.
+ -  To enable rescue mode, type: 01linux rescue <ENTER>07.  
+    Press 01<F5>07 for more information about rescue mode.
 
- -  If you have a driver disk, type: 0flinux dd <ENTER>07.
+ -  If you have a driver disk, type: 01linux dd <ENTER>07.
 
  -  To prompt for the install method being used on a CD-ROM install, 
-    type 0flinux askmethod <ENTER>07.
+    type 01linux askmethod <ENTER>07.
 
- -  If you have an installer update disk, type: 0flinux updates <ENTER>07.
+ -  If you have an installer update disk, type: 01linux updates <ENTER>07.
 
- -  To test the memory in your system type: 0fmemtest86 <ENTER>07.
+ -  To test the memory in your system type: 01memtest86 <ENTER>07.
     (This option is only available when booting from CD.)
 
-02[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
+0f[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
diff --git a/bootdisk/i386/param.msg b/bootdisk/i386/param.msg
index ac748b604..d1bf831d8 100644
--- a/bootdisk/i386/param.msg
+++ b/bootdisk/i386/param.msg
@@ -1,27 +1,21 @@
 00
 
 
-                        09Kernel Parameter Help07
+                        01Kernel Parameter Help07
 
 Some kernel parameters can be specified on the command line and will be
-passed to the kernel.  This does not include options to modules for devices 
-such as ethernet cards or devices such as CD-ROM drives.
+passed to the kernel.
 
 To pass an option to the kernel, use the following format:
 
-     0flinux <options>07
+     01linux <options>07
 
 If a different installation mode is desired, enter it after the option(s).
 
 For example, to install on a system with 256MB of RAM using noprobe mode, 
 type the following:
 
-     0flinux mem=256M noprobe07
+     01linux mem=256M noprobe07
 
-To pass options to modules, you will need to use the noprobe mode to disable
-PCI autoprobing.  When the installer asks for your device type that needs
-an option or parameter passed to it, there will be a place to type those
-in at that time. 
 
-
-02[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
+0f[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
diff --git a/bootdisk/i386/rescue.msg b/bootdisk/i386/rescue.msg
index acdd0f8a2..09464ffe6 100644
--- a/bootdisk/i386/rescue.msg
+++ b/bootdisk/i386/rescue.msg
@@ -1,7 +1,7 @@
 00
 
 
-                        09Rescue Mode Help07
+                        01Rescue Mode Help07
 
 The installer includes a rescue mode which can be used when a system
 does not boot properly.  The rescue mode includes many useful
@@ -9,11 +9,11 @@ utilities (editor, hard drive and RAID tools, etc.) which will allow
 one to restore a system to a working state.
 
 To enter the rescue mode, boot your system from the installation
-CDROM or floppy and type 0flinux rescue <ENTER>07.
+CDROM or floppy and type 01linux rescue <ENTER>07.
 
 
 
 
 
-02[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
+0f[F1-Main] [F2-Options] [F3-General] [F4-Kernel] [F5-Rescue]07
 
diff --git a/bootdisk/i386/snake.msg b/bootdisk/i386/snake.msg
deleted file mode 100644
index 27ff353c2..000000000
--- a/bootdisk/i386/snake.msg
+++ /dev/null
@@ -1,24 +0,0 @@
-00
-
-0a
-                          .-=-.          .--.
-              __        .'     '.       /  " )
-      _     .'  '.     /   .-.   \     /  .-'0c\0a
-     ( \   / .-.  \   /   /   \   \   /  /    0c^0a
-      \ `-` /   \  `-'   /     \   `-`  /
-       `-.-`     '.____.'       `.____.'
-07
-                                       _       
-  __ _ _ __   __ _  ___ ___  _ __   __| | __ _ 
- / _` | '_ \ / _` |/ __/ _ \| '_ \ / _` |/ _` |
-| (_| | | | | (_| | (_| (_) | | | | (_| | (_| |
- \__,_|_| |_|\__,_|\___\___/|_| |_|\__,_|\__,_|
-
-
-07
-
-
-
-
-
-
diff --git a/bootdisk/i386/syslinux.cfg b/bootdisk/i386/syslinux.cfg
index 30e731017..0c6dbf865 100755
--- a/bootdisk/i386/syslinux.cfg
+++ b/bootdisk/i386/syslinux.cfg
@@ -7,21 +7,14 @@ F2 options.msg
 F3 general.msg
 F4 param.msg
 F5 rescue.msg
-F7 snake.msg
 label linux
   kernel vmlinuz
-  append initrd=initrd.img ramdisk_size=8192
+  append initrd=initrd.img 
 label text
   kernel vmlinuz
-  append initrd=initrd.img text ramdisk_size=8192
-label expert
-  kernel vmlinuz
-  append expert initrd=initrd.img ramdisk_size=8192
+  append initrd=initrd.img text 
 label ks
   kernel vmlinuz
-  append ks initrd=initrd.img ramdisk_size=8192
-label lowres
-  kernel vmlinuz
-  append initrd=initrd.img lowres ramdisk_size=8192
+  append ks initrd=initrd.img
 label local
   localboot 1