--- rpms/anaconda/sme7/centos4-buildi586.patch	2007/06/12 14:39:14	1.1
+++ rpms/anaconda/sme7/centos4-buildi586.patch	2007/12/01 03:37:30	1.2
@@ -1,118 +1,3 @@
-diff -uNrp anaconda-10.1.1.63.orig/scripts/mk-images anaconda-10.1.1.63/scripts/mk-images
---- anaconda-10.1.1.63.orig/scripts/mk-images	2007-05-06 08:14:01.000000000 -0500
-+++ anaconda-10.1.1.63/scripts/mk-images	2007-05-06 09:06:50.000000000 -0500
-@@ -1099,20 +1099,28 @@ arches="$BUILDARCH"
- if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then
-     arches="ppc64pseries ppc64 ppc64iseries ppc"
- elif [ "$BUILDARCH" = "i386" ]; then
--    arches="i586"
--    kerneltags="kernel kernel-xenU"
-+    arches="i686 i586"
- elif [ "$BUILDARCH" = "x86_64" ]; then
-     kerneltags="kernel kernel-xenU"
- fi
- foundakernel=""
- for KERNELARCH in $arches; do
-+
-+  # allow kernel only for i586 and kernel, kernel-xenU for i686
-+  if [ "$KERNELARCH" = "i586" ]; then
-+      kerneltags="kernel"
-+  fi
-+  if [ "$KERNELARCH" = "i686" ]; then
-+      kerneltags="kernel kernel-xenU"
-+  fi
-+
-   for kernelvers in $kerneltags; do
--    kpackage=$($LATEST $KERNELPATH $kernelvers)
--    if [ "$KERNELARCH" = "i586" -a ! -f "$kpackage" ]; then
--	echo "No i586 kernel, trying i686..."
--	KERNELARCH="i686"
--	kpackage=$($LATEST $KERNELPATH kernel)
-+    if [ "$KERNELARCH" = "i586" ]; then
-+        kernelvers="kernel"
-+        kerneltags="kernel"
-+        kerneltag=""
-     fi
-+    kpackage=$($LATEST $KERNELPATH $kernelvers)
- 
-     if [ ! -f "$kpackage" ]; then
- 	echo "kernel ($kernelvers) does not exist for $KERNELARCH. skipping"
-diff -uNrp anaconda-10.1.1.63.orig/scripts/mk-images.i386 anaconda-10.1.1.63/scripts/mk-images.i386
---- anaconda-10.1.1.63.orig/scripts/mk-images.i386	2006-11-20 15:30:15.000000000 -0600
-+++ anaconda-10.1.1.63/scripts/mk-images.i386	2007-05-06 09:06:13.000000000 -0500
-@@ -22,11 +22,16 @@ 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
- 
--	pngtopnm $BOOTDISKDIR/syslinux-splash.png | ppmtolss16 \#000000=0 \#cdcfd5=7 \#c90000=2 \#ffffff=15 \#5b6c93=9 > $BOOTDISKDIR/splash.lss
-+	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
- 	   echo $0: Failed to create splash.lss
- 	   exit 1
-@@ -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
-@@ -173,7 +184,7 @@ makeBootImages() {
-     
-     # now make a boot pendrive image
-     mkdir -p $TOPDESTPATH/images/fobpath
--    dd if=/dev/zero of=$TOPDESTPATH/images/diskboot.img bs=1M count=6 2>/dev/null
-+    dd if=/dev/zero of=$TOPDESTPATH/images/diskboot.img bs=1M count=12 2>/dev/null
-     mkdosfs $TOPDESTPATH/images/diskboot.img
-     $SYSLINUX $TOPDESTPATH/images/diskboot.img
-     mount -o loop $TOPDESTPATH/images/diskboot.img $TOPDESTPATH/images/fobpath
-@@ -183,7 +194,20 @@ makeBootImages() {
-     umount -f $TOPDESTPATH/images/fobpath
-     rmdir $TOPDESTPATH/images/fobpath
-     
--    cat > $TOPDESTPATH/images/pxeboot/README <<EOF
-+    if [ -f $TOPDESTPATH/isolinux/vmlzi586 ]; then
-+      cat > $TOPDESTPATH/images/pxeboot/README <<EOF
-+The files in this directory are useful for booting a machine via PXE.
-+
-+The following files are available:
-+vmlinuz - the BOOT kernel used for the i686 installer
-+initrd.img - an initrd with support for all install methods and
-+    drivers supported for installation of $PRODUCT i686
-+vmlzi586 - the BOOT kernel used for the i586 installer
-+initi586.img - an initrd with support for all install methods and
-+    drivers supported for installation of $PRODUCT i586
-+EOF
-+    else
-+      cat > $TOPDESTPATH/images/pxeboot/README <<EOF
- The files in this directory are useful for booting a machine via PXE.  
- 
- The following files are available:
-@@ -191,6 +215,7 @@ vmlinuz - the BOOT kernel used for the i
- initrd.img - an initrd with support for all install methods and
-     drivers supported for installation of $PRODUCT
- EOF
-+    fi
-   else # set up the boot stuff for the xen guest kernel
-     echo "Building $KERNELARCH guest initrd.img"
-     mkdir -p $TOPDESTPATH/images/xen
 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
@@ -214,3 +99,97 @@ diff -uNr anaconda-10.1.1.37.orig/bootdi
  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
+@@ -173,7 +184,7 @@ makeBootImages() {
+     
+     # now make a boot pendrive image
+     mkdir -p $TOPDESTPATH/images/fobpath
+-    dd if=/dev/zero of=$TOPDESTPATH/images/diskboot.img bs=1M count=6 2>/dev/null
++    dd if=/dev/zero of=$TOPDESTPATH/images/diskboot.img bs=1M count=12 2>/dev/null
+     mkdosfs $TOPDESTPATH/images/diskboot.img
+     $SYSLINUX $TOPDESTPATH/images/diskboot.img
+     mount -o loop $TOPDESTPATH/images/diskboot.img $TOPDESTPATH/images/fobpath
+@@ -183,7 +194,20 @@ makeBootImages() {
+     umount -f $TOPDESTPATH/images/fobpath
+     rmdir $TOPDESTPATH/images/fobpath
+     
+-    cat > $TOPDESTPATH/images/pxeboot/README <<EOF
++    if [ -f $TOPDESTPATH/isolinux/vmlzi586 ]; then
++      cat > $TOPDESTPATH/images/pxeboot/README <<EOF
++The files in this directory are useful for booting a machine via PXE.
++
++The following files are available:
++vmlinuz - the BOOT kernel used for the i686 installer
++initrd.img - an initrd with support for all install methods and
++    drivers supported for installation of $PRODUCT i686
++vmlzi586 - the BOOT kernel used for the i586 installer
++initi586.img - an initrd with support for all install methods and
++    drivers supported for installation of $PRODUCT i586
++EOF
++    else
++      cat > $TOPDESTPATH/images/pxeboot/README <<EOF
+ The files in this directory are useful for booting a machine via PXE.  
+ 
+ The following files are available:
+@@ -191,6 +215,7 @@ vmlinuz - the BOOT kernel used for the i
+ initrd.img - an initrd with support for all install methods and
+     drivers supported for installation of $PRODUCT
+ EOF
++    fi
+   else # set up the boot stuff for the xen guest kernel
+     echo "Building $KERNELARCH guest initrd.img"
+     mkdir -p $TOPDESTPATH/images/xen