diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/boot.msg anaconda-10.1.1.37/bootdisk/i386/boot.msg --- anaconda-10.1.1.37.orig/bootdisk/i386/boot.msg 2003-09-22 14:37:20.000000000 -0500 +++ anaconda-10.1.1.37/bootdisk/i386/boot.msg 2006-03-09 15:13:21.000000000 -0600 @@ -3,7 +3,11 @@ - To install or upgrade in graphical mode, press the 0f07 key. + - To install or upgrade in graphical mode on an i586 machine, + type 0fi586 07. + - To install or upgrade in text mode, type: 0flinux text 07. + (or for i586 machines in text mode type: 0fi586 text 07.) - Use the function keys listed below for more information. diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/general.msg anaconda-10.1.1.37/bootdisk/i386/general.msg --- anaconda-10.1.1.37.orig/bootdisk/i386/general.msg 2003-07-09 00:06:18.000000000 -0500 +++ anaconda-10.1.1.37/bootdisk/i386/general.msg 2006-03-09 15:18:25.000000000 -0600 @@ -6,12 +6,16 @@ You are now ready to begin the installation process. In most cases, the best way to get started is to simply press the 0f07 key. +If you are doing an install on an i586 machine, you would substitute +0fi58607 for 0flinux07 throughout these instructions. + If you are having problems with the graphical installer, you can use the '0fresolution=x07' 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'. +'0flinux resolution=1024x76807' or '0fi586 resolution=1024x76807'. + +If you have problems with displaying before the graphical environment starts, +try booting with '0flinux nofb07' or '0fi586 nofb07'. Certain hardware configurations may have trouble with the automatic hardware detection done during the installation. If you experience problems during the diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/options.msg anaconda-10.1.1.37/bootdisk/i386/options.msg --- anaconda-10.1.1.37.orig/bootdisk/i386/options.msg 2003-08-05 10:11:28.000000000 -0500 +++ anaconda-10.1.1.37/bootdisk/i386/options.msg 2006-03-09 15:21:47.000000000 -0600 @@ -3,6 +3,9 @@ 09Installer Boot Options07 + If installing on an i586 machine, substitute 0fi58607 for 0flinux07 + for all the options listed on this page. + - To disable hardware probing, type: 0flinux noprobe 07. - To test the install media you are using, type: 0flinux mediacheck 07. diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/param.msg anaconda-10.1.1.37/bootdisk/i386/param.msg --- anaconda-10.1.1.37.orig/bootdisk/i386/param.msg 2003-09-22 14:37:20.000000000 -0500 +++ anaconda-10.1.1.37/bootdisk/i386/param.msg 2006-03-09 15:23:24.000000000 -0600 @@ -10,6 +10,8 @@ To pass an option to the kernel, use the following format: 0flinux 07 + or + 0fi586 07 If a different installation mode is desired, enter it after the option(s). @@ -17,6 +19,8 @@ type the following: 0flinux mem=128M noprobe07 + or + 0fi586 mem=128M 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 diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/rescue.msg anaconda-10.1.1.37/bootdisk/i386/rescue.msg --- anaconda-10.1.1.37.orig/bootdisk/i386/rescue.msg 2003-09-22 14:37:20.000000000 -0500 +++ anaconda-10.1.1.37/bootdisk/i386/rescue.msg 2006-03-09 15:24:40.000000000 -0600 @@ -9,8 +9,11 @@ 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 07. +CDROM or floppy and type: + 0flinux rescue 07. + or + 0fi586 rescue 07. diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/syslinux.cfg anaconda-10.1.1.37/bootdisk/i386/syslinux.cfg --- anaconda-10.1.1.37.orig/bootdisk/i386/syslinux.cfg 2004-09-22 14:17:54.000000000 -0500 +++ anaconda-10.1.1.37/bootdisk/i386/syslinux.cfg 2006-03-09 15:26:28.000000000 -0600 @@ -11,6 +11,9 @@ label linux kernel vmlinuz append initrd=initrd.img ramdisk_size=8192 +label i586 + kernel vmlzi586 + append initrd=initi586.img ramdisk_size=8192 label text kernel vmlinuz append initrd=initrd.img text ramdisk_size=8192 diff -uNrp anaconda-10.1.1.62.orig/scripts/mk-images anaconda-10.1.1.62/scripts/mk-images --- anaconda-10.1.1.62.orig/scripts/mk-images 2007-03-05 10:10:56.000000000 -0600 +++ anaconda-10.1.1.62/scripts/mk-images 2007-03-05 10:15:31.000000000 -0600 @@ -1099,7 +1099,7 @@ arches="$BUILDARCH" if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then arches="ppc64pseries ppc64 ppc64iseries ppc" elif [ "$BUILDARCH" = "i386" ]; then - arches="i586" + arches="i686 i586" kerneltags="kernel kernel-xenU" elif [ "$BUILDARCH" = "x86_64" ]; then kerneltags="kernel kernel-xenU" @@ -1124,7 +1124,7 @@ for KERNELARCH in $arches; do mkdir -p $KERNELROOT/lib/modules/misc foundakernel="yes" - if [ "${kernelvers}" = "kernel-xenU" ]; then kerneltag="xenU" ; fi + if [ "${kernelvers}" = "kernel-xenU" ]; then kerneltag="xenU" ; else kerneltag=""; fi ppackage=$($LATEST $KERNELPATH hwdata) if [ ! -f "$ppackage" ]; then diff -uNrp anaconda-10.1.1.62.orig/scripts/mk-images.i386 anaconda-10.1.1.62/scripts/mk-images.i386 --- anaconda-10.1.1.62.orig/scripts/mk-images.i386 2007-03-05 10:10:57.000000000 -0600 +++ anaconda-10.1.1.62/scripts/mk-images.i386 2007-03-05 10:28:25.000000000 -0600 @@ -22,9 +22,14 @@ prepareBootImage() { # used to populate a boot image prepareBootTree() { (cd $BOOTDISKDIR; find . ! -name "*.msg" -maxdepth 1 ! -type d | cpio --quiet -p $MBD_BOOTTREE) - - cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img - cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz + + if [ "$KERNELARCH" = "i586" ]; then + cp $MBD_FSIMAGE $MBD_BOOTTREE/init${KERNELARCH}.img + cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlz${KERNELARCH} + else + cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img + cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz + fi pngtopnm $BOOTDISKDIR/syslinux-splash.png | ppmtolss16 \#3399FF=2 > $BOOTDISKDIR/splash.lss if [ $? != 0 ]; then @@ -155,6 +160,12 @@ makeBootImages() { rm -f $TOPDESTPATH/images/pxeboot/* ln $TOPDESTPATH/isolinux/vmlinuz $TOPDESTPATH/images/pxeboot/vmlinuz ln $TOPDESTPATH/isolinux/initrd.img $TOPDESTPATH/images/pxeboot/initrd.img + if [ -f $TOPDESTPATH/isolinux/vmlzi586 ]; then + ln $TOPDESTPATH/isolinux/vmlzi586 $TOPDESTPATH/images/pxeboot/vmlzi586 + fi + if [ -f $TOPDESTPATH/isolinux/initi586.img ]; then + ln $TOPDESTPATH/isolinux/initi586.img $TOPDESTPATH/images/pxeboot/initi586.img + fi # links for the autoboot bits if [ -f $TOPDESTPATH/dosutils/loadlin.exe ]; then @@ -183,7 +194,20 @@ makeBootImages() { umount -f $TOPDESTPATH/images/fobpath rmdir $TOPDESTPATH/images/fobpath - cat > $TOPDESTPATH/images/pxeboot/README < $TOPDESTPATH/images/pxeboot/README < $TOPDESTPATH/images/pxeboot/README <