rpms/anaconda/F-9 anaconda-11.4.0.83-more-sparc-fixes.patch, 1.6, 1.7 anaconda.spec, 1.692, 1.693

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/anaconda/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29916

Modified Files:
	anaconda-11.4.0.83-more-sparc-fixes.patch anaconda.spec 
Log Message:
fix silo.conf

anaconda-11.4.0.83-more-sparc-fixes.patch:

Index: anaconda-11.4.0.83-more-sparc-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda-11.4.0.83-more-sparc-fixes.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- anaconda-11.4.0.83-more-sparc-fixes.patch	4 Oct 2008 16:06:33 -0000	1.6
+++ anaconda-11.4.0.83-more-sparc-fixes.patch	5 Oct 2008 16:17:10 -0000	1.7
@@ -1,7 +1,7 @@
 diff -up anaconda-11.4.0.83/bootdisk/sparc/silo.conf.spot anaconda-11.4.0.83/bootdisk/sparc/silo.conf
---- anaconda-11.4.0.83/bootdisk/sparc/silo.conf.spot	2008-10-04 11:12:37.000000000 -0400
-+++ anaconda-11.4.0.83/bootdisk/sparc/silo.conf	2008-10-04 11:12:10.000000000 -0400
-@@ -2,20 +2,20 @@ partition=1
+--- anaconda-11.4.0.83/bootdisk/sparc/silo.conf.spot	2008-10-01 21:32:11.000000000 -0400
++++ anaconda-11.4.0.83/bootdisk/sparc/silo.conf	2008-10-05 12:09:12.000000000 -0400
+@@ -2,31 +2,31 @@ partition=1
  default=linux
  read-write
  timeout=100
@@ -27,10 +27,24 @@
 +image="cat /boot/rescue.msg"
          label=5
          single-key
- image[sun4u]=/boot/vmlinux
+-image[sun4u]=/boot/vmlinux
++image[sun4u]=/boot/vmlinuz
+         label=linux
+         alias=install
+         initrd=/boot/initrd.img
+-image[sun4u]=/boot/vmlinux
++image[sun4u]=/boot/vmlinuz
+         label=text
+         append=text
+         initrd=/boot/initrd.img
+-image[sun4u]=/boot/vmlinux
++image[sun4u]=/boot/vmlinuz
+         label=ks
+         append=ks
+         initrd=/boot/initrd.img
 diff -up anaconda-11.4.0.83/scripts/mk-images.sparc.spot anaconda-11.4.0.83/scripts/mk-images.sparc
 --- anaconda-11.4.0.83/scripts/mk-images.sparc.spot	2008-10-01 21:32:11.000000000 -0400
-+++ anaconda-11.4.0.83/scripts/mk-images.sparc	2008-10-04 11:44:50.000000000 -0400
++++ anaconda-11.4.0.83/scripts/mk-images.sparc	2008-10-05 12:08:50.000000000 -0400
 @@ -44,6 +44,8 @@ maketftp() {
         exit 1
      done
@@ -130,7 +144,7 @@
  }
 diff -up anaconda-11.4.0.83/scripts/mk-images.spot anaconda-11.4.0.83/scripts/mk-images
 --- anaconda-11.4.0.83/scripts/mk-images.spot	2008-10-01 21:32:11.000000000 -0400
-+++ anaconda-11.4.0.83/scripts/mk-images	2008-10-03 15:57:03.000000000 -0400
++++ anaconda-11.4.0.83/scripts/mk-images	2008-10-05 12:08:50.000000000 -0400
 @@ -128,7 +128,7 @@ INITRDMODS="$USBMODS $FIREWIREMODS $IDEM
  	KERNELDIR="/boot"
      fi
@@ -180,8 +194,8 @@
  
  foundakernel=""
 diff -up anaconda-11.4.0.83/scripts/pkgorder.spot anaconda-11.4.0.83/scripts/pkgorder
---- anaconda-11.4.0.83/scripts/pkgorder.spot	2008-10-04 12:01:59.000000000 -0400
-+++ anaconda-11.4.0.83/scripts/pkgorder	2008-10-04 12:02:28.000000000 -0400
+--- anaconda-11.4.0.83/scripts/pkgorder.spot	2008-10-01 21:32:11.000000000 -0400
++++ anaconda-11.4.0.83/scripts/pkgorder	2008-10-05 12:08:50.000000000 -0400
 @@ -71,7 +71,7 @@ class PackageOrderer(yum.YumBase):
          self.doRepoSetup()
  
@@ -193,7 +207,7 @@
          self.doTsSetup()
 diff -up anaconda-11.4.0.83/scripts/upd-instroot.spot anaconda-11.4.0.83/scripts/upd-instroot
 --- anaconda-11.4.0.83/scripts/upd-instroot.spot	2008-10-01 21:32:11.000000000 -0400
-+++ anaconda-11.4.0.83/scripts/upd-instroot	2008-10-03 15:59:05.000000000 -0400
++++ anaconda-11.4.0.83/scripts/upd-instroot	2008-10-05 12:08:50.000000000 -0400
 @@ -198,7 +198,7 @@ if [ $ARCH = ppc -o $ARCH = ppc64 ]; the
      PACKAGES="$PACKAGES pcmciautils pdisk yaboot hfsutils"
  fi


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda.spec,v
retrieving revision 1.692
retrieving revision 1.693
diff -u -r1.692 -r1.693
--- anaconda.spec	4 Oct 2008 16:06:33 -0000	1.692
+++ anaconda.spec	5 Oct 2008 16:17:10 -0000	1.693
@@ -3,7 +3,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 11.4.0.83
-Release: 7
+Release: 8
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -214,6 +214,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Sun Oct 05 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-8
+- fix silo.conf
+
 * Sat Oct 04 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-7
 - one more pkgorder fix, drop patch suffix