We'd noticed that when manually partitioning the disk, some amount of
space was left free at the end of the disk after growing partitions. In
particular, the amount of free space was equal to the contents of the
"Size (MB)" field on the Edit Partition screen. This first started
appearing after an autopart.py fix for dual booting on Mac OS X.
It being late on a Friday and partitioning code being hard enough to
stare at even normally, here's the patch for everyone else to review
before we commit. I'm wondering if this rebreaks the Mac OS X case or
not. We don't think so, but I'd like some confirmation.
- Chris
Index: autopart.py
===================================================================
RCS file: /usr/local/CVS/anaconda/autopart.py,v
retrieving revision 1.166
diff -u -r1.166 autopart.py
--- autopart.py 6 May 2005 19:42:52 -0000 1.166
+++ autopart.py 20 May 2005 21:28:07 -0000
@@ -621,12 +621,12 @@
del free[key]
continue
freeSize[key] = 0
- largestFree[key] = 0
+ largestFree[key] = (0, 0)
for part in free[key]:
sz = partedUtils.getPartSize(part)
freeSize[key] += sz
- if sz > largestFree[key]:
- largestFree[key] = sz
+ if sz > largestFree[key][0]:
+ largestFree[key] = (sz, part.geom.start)
return (free, freeSize, largestFree)
@@ -789,8 +789,8 @@
maxsect = long(maxFSSize)
imposedMax = 1
- maxfree = largestFree[drive]
- if maxsect > largestFree[drive]:
+ (maxfree, freestart) = largestFree[drive]
+ if maxsect > maxfree + freestart:
maxsect = long(maxfree)
imposedMax = 1
