Merge lp:~barry/update-manager/132311-bootspace into lp:update-manager

[Barry Warsaw]

Bumps the /boot space assigned to new kernels by about 500K/kernel. Based on my inspection, the old value undercounts by about 260K/kernel. I think this is about the best we can do to address the /boot space problem in bug 132311.

[Michael Vogt (mvo)]

How about we add a full meg? Bump to 19 or even 20 mb just to be sure that we are not too low?

[Barry Warsaw (barry)]

I thought about using 19 but it seemed excessive. Maybe it wasn't! :) I think 19 would be plenty for now.

[Michael Vogt (mvo)]

Thanks, I merged it via diff apply now, I can not merge directly because its in a loom format that my bzr does not (yet?) understand :)

=== modified file 'DistUpgrade/DistUpgradeCache.py'
--- DistUpgrade/DistUpgradeCache.py	2010-04-01 20:18:49 +0000
+++ DistUpgrade/DistUpgradeCache.py	2010-04-02 16:53:16 +0000
@@ -49,7 +49,7 @@
     pass
 
 # the initrd/vmlinuz/abi space required in /boot for each kernel
-KERNEL_INITRD_SIZE = 18*1024*1024
+KERNEL_INITRD_SIZE = 18.5 * 1024 * 1024
 
 class FreeSpaceRequired(object):
     """ FreeSpaceRequired object:
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-03-31 19:49:55 +0000
+++ debian/changelog	2010-04-02 16:53:16 +0000
@@ -1,3 +1,10 @@
+update-manager (1:0.133.8ubuntu1) lucid; urgency=low
+
+  * Bump up the amount of /boot space calculated per kernel.  The current
+    value appears to undercount by about 260K/kernel. (LP: #132311)
+
+ -- Barry Warsaw <[e-mail]>  Fri, 02 Apr 2010 12:45:11 -0400
+
 update-manager (1:0.133.8) UNRELEASED; urgency=low
 
   * DistUpgrade/DistUpgradeController.py, DistUpgrade/DistUpgradeCache.py: