diff options
| author | David Lehman <dlehman@redhat.com> | 2012-10-10 15:05:34 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2012-10-12 09:24:55 -0500 |
| commit | a4b551b4bb1fbd8a692ce3e1960e66a547597a5c (patch) | |
| tree | aeaa272a20db2954639e11a3744486ae95f5676d | |
| parent | 992638a1ad2339ccdc318fc887b204b4cc6e13cc (diff) | |
| download | anaconda-a4b551b4bb1fbd8a692ce3e1960e66a547597a5c.tar.gz anaconda-a4b551b4bb1fbd8a692ce3e1960e66a547597a5c.tar.xz anaconda-a4b551b4bb1fbd8a692ce3e1960e66a547597a5c.zip | |
Make sure partition base sizes are adequate for their formatting.
There is no guarantee of growth, so be sure to start with a size
that can hold the specified formatting.
| -rw-r--r-- | pyanaconda/storage/__init__.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index 1e6a1f7c9..8df216e5a 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -1848,6 +1848,7 @@ class Storage(object): device_space = factory.device_size log.debug("device requires %d" % device_space) container_size += device_space + base_size = max(1, getFormat(factory.member_format).minSize) # XXX TODO: multiple member devices per disk @@ -1856,7 +1857,7 @@ class Storage(object): if isinstance(member, LUKSDevice): member = member.slave - member.req_base_size = 1 + member.req_base_size = base_size member.req_size = member.req_base_size member.req_grow = True @@ -1870,7 +1871,8 @@ class Storage(object): member_format = factory.member_format try: - member = self.newPartition(parents=[disk], grow=True, size=1, + member = self.newPartition(parents=[disk], grow=True, + size=base_size, fmt_type=member_format) except StorageError as e: log.error("failed to create new member partition: %s" % e) @@ -3223,7 +3225,8 @@ class PartitionFactory(DeviceFactory): log.info("adjusting device size from %.2f to %.2f" % (device.size, size)) - device.req_base_size = min(PartitionFactory.default_size, size) + size = min(PartitionFactory.default_size, size) + device.req_base_size = max(size, device.format.minSize) device.req_size = device.req_base_size device.req_max_size = size device.req_grow = size > device.req_base_size |