rpms/anaconda/F-9 anaconda-11.4.0.83-sparc-getMinimumSector.patch, NONE, 1.1 anaconda.spec, 1.697, 1.698

[Tom Callaway]

Author: spot

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

Modified Files:
	anaconda.spec 
Added Files:
	anaconda-11.4.0.83-sparc-getMinimumSector.patch 
Log Message:
make sure we never start at sector 0 on sun disk

anaconda-11.4.0.83-sparc-getMinimumSector.patch:

--- NEW FILE anaconda-11.4.0.83-sparc-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	2008-12-18 17:46:40.000000000 -0500
+++ anaconda-11.4.0.83/autopart.py	2008-12-18 17:54:55.000000000 -0500
@@ -415,6 +415,11 @@ def fitSized(diskset, requests, primOnly
 	    if rhpl.getArch() == "alpha" and startSec < long((1024L * 1024L)/disk.dev.sector_size):
 		startSec = long((2 * 1024L * 1024L)/disk.dev.sector_size)
 
+            # XXX need to check overlaps properly here
+            minSec = getMinimumSector(disk)
+            if startSec < minSec:
+                startSec = minSec
+
             endSec = startSec + long(((request.requestSize * 1024L * 1024L) / disk.dev.sector_size)) - 1
 
             if endSec > freeEndSec:


Index: anaconda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anaconda/F-9/anaconda.spec,v
retrieving revision 1.697
retrieving revision 1.698
diff -u -r1.697 -r1.698
--- anaconda.spec	16 Dec 2008 18:47:00 -0000	1.697
+++ anaconda.spec	18 Dec 2008 23:02:07 -0000	1.698
@@ -3,7 +3,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 11.4.0.83
-Release: 11
+Release: 12
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -14,6 +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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: sparc64
@@ -164,6 +165,8 @@
 %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
+%patch5 -p1
 
 %build
 %{__make} depend
@@ -226,6 +229,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* 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
+
 * Tue Dec 16 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 11.4.0.83-11
 - fix isys raid code to work with newer kernel headers