2005-03-29 Jeremy Katz <katzj@redhat.com>

	* constants.py: Fix traceback

	* bootdisk/sparc/*: Remove out of date sparc files.

	* anaconda: Product name fixup
	* bootdisk/ppc/bootinfo.txt: Likewise.
	* loader2/linuxrc.s390: Likewise.

9 files changed, 2 insertions, 232 deletions

diff --git a/bootdisk/ppc/bootinfo.txt b/bootdisk/ppc/bootinfo.txt
index d1396d2bb..ac766d4d2 100644
--- a/bootdisk/ppc/bootinfo.txt
+++ b/bootdisk/ppc/bootinfo.txt
@@ -1,5 +1,5 @@
-<chrp-boot> <description>Red Hat Linux</description> 
-<os-name>Red Hat Linux</os-name> 
+<chrp-boot> <description>Linux</description> 
+<os-name>Linux</os-name> 
 <boot-script>boot &device;:\ppc\chrp\yaboot</boot-script> 
 <icon size=64,64 color-space=3,3,2> 
 <bitmap> FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
diff --git a/bootdisk/sparc/boot.msg b/bootdisk/sparc/boot.msg
deleted file mode 100644
index be1621d74..000000000
--- a/bootdisk/sparc/boot.msg
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-                   Welcome to Red Hat Linux!
-
- o  To install or upgrade a system running Red Hat Linux 4.0
-    or later, press the <ENTER> key.
-
- o  To enable expert mode, type: expert <ENTER>.  Press <3> for
-    more information about expert mode.
-
- o  To install using text mode, type text <ENTER>
-
- o  Use the numeric keys listed below at the beginning of input line
-    for more information.
-
-
-
-
-
-
-
-[1-Main] [2-General] [3-Expert] [4-Rescue] [5-Kickstart] [6-Kernel]
diff --git a/bootdisk/sparc/expert.msg b/bootdisk/sparc/expert.msg
deleted file mode 100644
index 5381a8216..000000000
--- a/bootdisk/sparc/expert.msg
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-                        Expert Mode Help
-
-The default method of installing Red Hat Linux uses autoprobing to
-automatically detect the hardware in your system.  Although most
-systems may be autoprobed without difficulties, in certain cases there
-can be problems.  It's possible to overcome these problems by using
-expert mode.
-
-To start the installation using expert mode, type expert <ENTER>.
-
-While in expert mode, you will have complete control over the
-installation process.  You will also be able to enter optional module
-parameters while in expert mode.
-
-
-
-
-
-
-
-
-[1-Main] [2-General] [3-Expert] [4-Rescue] [5-Kickstart] [6-Kernel]
diff --git a/bootdisk/sparc/general.msg b/bootdisk/sparc/general.msg
deleted file mode 100644
index 9f62a6c07..000000000
--- a/bootdisk/sparc/general.msg
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-                        General Boot Help
-
-You can load the Red Hat Linux installation program, and begin the 
-installation process from this prompt.  In most cases, the best way to
-get started is to simply press the <ENTER> key.
-
-Certain hardware configurations may have trouble with the automatic hardware
-detection done during the installation.  While this is unusual, it does
-happen occasionally.  If you experience problems during the installation,
-restart the installation using expert mode.  Press <3> for more
-information on expert mode.
-
-This boot disk can no longer be used as a rescue disk.  Press <4> for
-information on the new rescue disks.
-
-There are a number of parameters that can be passed to the Linux kernel
-at boot time.  These do not include parameters for devices such as
-CD-ROM drives or ethernet cards.  Press <6> for more information. 
-
-
-
-[1-Main] [2-General] [3-Expert] [4-Rescue] [5-Kickstart] [6-Kernel]
diff --git a/bootdisk/sparc/kickit.msg b/bootdisk/sparc/kickit.msg
deleted file mode 100644
index 874e4f7b1..000000000
--- a/bootdisk/sparc/kickit.msg
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-                      Red Hat Kickstart Mode
-
-Red Hat provides a method for unattended installation of a system
-using a text configuration file.  To enter the kickstart mode, type
-linux ks <ENTER>.   Kickstart mode works with both NFS and CD-ROM 
-installations.
-
-The installation program looks in the following places for the config file:
-   o   the broadcast server from bootp. 
-   o   the bootp server if no other server name is broadcast.
-   o   on the boot floppy if linux ks=floppy <ENTER> is given.
-
-The file it looks for is given by the bootp server as either a directory or
-an explicit file name.  If a directory is given, then kickstart looks for a
-file in that directory with the IP of the client as the file name followed
-by "-kickstart" (ie. 192.168.0.1-kickstart).  If the floppy argument is
-given, then it will look for a file named "ks" on that floppy.
-
-[1-Main] [2-General] [3-Expert] [4-Rescue] [5-Kickstart] [6-Kernel]
diff --git a/bootdisk/sparc/param.msg b/bootdisk/sparc/param.msg
deleted file mode 100644
index 8bc9165bc..000000000
--- a/bootdisk/sparc/param.msg
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-                        Kernel Parameter Help
-
-Some kernel parameters can be specified on the command line and will be
-passed to the running kernel.  This does not include options to modules
-such as ethernet cards or devices such as CD-ROM drives.
-
-To pass an option to the kernel, use the following format:
-     linux <options>
-If a different installation mode is desired, enter it after the option(s).
-
-For example, to install on a system with 128MB of RAM using expert mode, 
-type the following:
-     linux mem=128M expert
-
-To pass options to modules, you will need to use the expert mode to disable
-PCI and SBUS autoprobing.  When the installation 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. 
-
-
-
-[1-Main] [2-General] [3-Expert] [4-Rescue] [5-Kickstart] [6-Kernel]
diff --git a/bootdisk/sparc/rescue.msg b/bootdisk/sparc/rescue.msg
deleted file mode 100644
index 9d19402ac..000000000
--- a/bootdisk/sparc/rescue.msg
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-                       Red Hat Rescue Mode
-
-The Red Hat installation program has undergone changes that will allow 
-you to create a custom boot disk for your specific system.  This new boot
-disk is customized according to your system's hardware configuration.  This 
-will ensure that you will always be able to boot your system, even if LILO
-has been overwritten by another operating system.
-
-Your boot disk is the first disk in a two-part rescue disk set.  The second
-disk required for rescue mode must be created from the rescue.img image file,
-located in the images directory of the Red Hat Linux CD.  To create the
-second disk, insert a blank floppy in your system's floppy drive, and type
-dd if=rescue.img of=/dev/fd0 bs=72k.  You may then boot into rescue mode by
-booting from your boot disk, and typing rescue at the boot prompt.  Insert
-the disk created from rescue.img when prompted to do so.
-
-
-[1-Main] [2-General] [3-Expert] [4-Rescue] [5-Kickstart] [6-Kernel]
diff --git a/bootdisk/sparc/silo.conf b/bootdisk/sparc/silo.conf
deleted file mode 100644
index 20cd91417..000000000
--- a/bootdisk/sparc/silo.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-partition=1
-default=linux
-read-write
-timeout=100
-message=/etc/boot.msg
-image="cat /etc/boot.msg"
-	label=1
-	single-key
-image="cat /etc/general.msg"
-	label=2
-	single-key
-image="cat /etc/expert.msg"
-	label=3
-	single-key
-image="cat /etc/rescue.msg"
-	label=4
-	single-key
-image="cat /etc/kickit.msg"
-	label=5
-	single-key
-image="cat /etc/param.msg"
-	label=6
-	single-key
-image[sun4u]=/boot/vmlinux64.gz
-        label=linux
-        alias=install
-	initrd=/boot/initrd64.img
-image[sun4c,sun4d,sun4m]=/boot/vmlinux32.gz
-        label=linux
-        alias=install
-	initrd=/boot/initrd32.img
-image[sun4u]=/boot/vmlinux64.gz
-        label=text
-        append=text
-	initrd=/boot/initrd64.img
-image[sun4c,sun4d,sun4m]=/boot/vmlinux32.gz
-        label=text
-        append=text
-	initrd=/boot/initrd32.img
-image[sun4u]=/boot/vmlinux64.gz
-        label=expert
-        append=expert
-	initrd=/boot/initrd64.img
-image[sun4c,sun4d,sun4m]=/boot/vmlinux32.gz
-        label=expert
-        append=expert
-	initrd=/boot/initrd32.img
-image[sun4u]=/boot/vmlinux64.gz
-        label=ks
-        append=ks
-	initrd=/boot/initrd64.img
-image[sun4c,sun4d,sun4m]=/boot/vmlinux32.gz
-        label=ks
-        append=ks
-	initrd=/boot/initrd32.img
diff --git a/bootdisk/sparc/silo64.conf b/bootdisk/sparc/silo64.conf
deleted file mode 100644
index 766e2d7d6..000000000
--- a/bootdisk/sparc/silo64.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-partition=1
-root=/dev/fd0
-default=linux
-read-write
-timeout=100
-message=/boot.msg
-image="cat /boot.msg"
-	label=1
-	single-key
-image="cat /general.msg"
-	label=2
-	single-key
-image="cat /expert.msg"
-	label=3
-	single-key
-image="cat /rescue.msg"
-	label=4
-	single-key
-image="cat /kickit.msg"
-	label=5
-	single-key
-image="cat /param.msg"
-	label=6
-	single-key
-image=/vmlinux64.gz
-        label=linux
-        alias=install
-	initrd=/initrd64.img
-image=/vmlinux64.gz
-        label=text
-        append=text
-	initrd=/initrd64.img
-image=/vmlinux64.gz
-        label=expert
-        append=expert
-	initrd=/initrd64.img
-image=/vmlinux64.gz
-        label=ks
-        append=ks
-	initrd=/initrd64.img