rpms/anaconda/F-9 anaconda-11.4.0.83-no-sun-disk-magic-for-getMinimumSector.patch, NONE, 1.1 anaconda.spec, 1.698, 1.699 anaconda-11.4.0.83-sparc-getMinimumSector.patch, 1.1, NONE

[Tom Callaway]

Author: spot

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

Modified Files:
	anaconda.spec 
Added Files:
	anaconda-11.4.0.83-no-sun-disk-magic-for-getMinimumSector.patch 
Removed Files:
	anaconda-11.4.0.83-sparc-getMinimumSector.patch 
Log Message:
back out anaconda-11.4.0.83-sparc-getMinimumSector.patch. that code is almost never right on sparc, so we also back it out where it existed before.

anaconda-11.4.0.83-no-sun-disk-magic-for-getMinimumSector.patch:

--- NEW FILE anaconda-11.4.0.83-no-sun-disk-magic-for-getMinimumSector.patch ---
diff -up anaconda-11.4.0.83/autopart.py.BAD anaconda-11.4.0.83/autopart.py
--- anaconda-11.4.0.83/autopart.py.BAD	2009-02-02 15:18:26.000000000 -0500
+++ anaconda-11.4.0.83/autopart.py	2009-02-02 15:18:46.000000000 -0500
@@ -195,10 +195,11 @@ class partlist:
         self.parts = []
 
 def getMinimumSector(disk):
-    if disk.type.name == 'sun':
-        start = long(disk.dev.sectors * disk.dev.heads)
-        start /= (1024 / disk.dev.sector_size)
-        return start + 1
+    # This is more trouble than it is worth.
+    # if disk.type.name == 'sun':
+    #    start = long(disk.dev.sectors * disk.dev.heads)
+    #    start /= (1024 / disk.dev.sector_size)
+    #    return start + 1
     return 0L
 
 # first step of partitioning voodoo


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda.spec,v
retrieving revision 1.698
retrieving revision 1.699
diff -u -r1.698 -r1.699
--- anaconda.spec	18 Dec 2008 23:02:07 -0000	1.698
+++ anaconda.spec	2 Feb 2009 20:22:56 -0000	1.699
@@ -3,7 +3,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 11.4.0.83
-Release: 12
+Release: 13
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -14,7 +14,7 @@
 Patch2: anaconda-11.4.0.83-sparc-fixtftp.patch
 Patch3: anaconda-11.4.0.83-sparc-fixverify.patch
 Patch4: anaconda-11.4.0.83-raid-headers.patch
-Patch5: anaconda-11.4.0.83-sparc-getMinimumSector.patch
+Patch5: anaconda-11.4.0.83-no-sun-disk-magic-for-getMinimumSector.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: sparc64
@@ -165,7 +165,7 @@
 %patch3 -p1
 # Fix isys raid code for newer kernel headers (from anaconda HEAD)
 %patch4 -p1
-# Make sure the minimum sector is never 0 on sun disk types
+# Get rid of sun disk specific getMinimumsector routines
 %patch5 -p1
 
 %build
@@ -229,6 +229,11 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Feb  2 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-13
+- back out anaconda-11.4.0.83-sparc-getMinimumSector.patch
+  that code is almost never right on sparc, so we also back it out where 
+  it existed before.
+
 * Thu Dec 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-12
 - Make sure the minimum sector is never 0 on sun disk types
 


--- anaconda-11.4.0.83-sparc-getMinimumSector.patch DELETED ---