diff --git a/subiquity/server/controllers/filesystem.py b/subiquity/server/controllers/filesystem.py index 153c688c..5d8d5091 100644 --- a/subiquity/server/controllers/filesystem.py +++ b/subiquity/server/controllers/filesystem.py @@ -157,13 +157,8 @@ class VariationInfo: def capability_info_for_gap( self, gap: gaps.Gap, + install_min: int, ) -> CapabilityInfo: - if self.label is None: - install_min = sizes.calculate_suggested_install_min( - self.min_size, gap.device.alignment_data().part_align - ) - else: - install_min = self.min_size r = CapabilityInfo() r.disallowed = list(self.capability_info.disallowed) if self.capability_info.allowed and gap.size < install_min: @@ -1015,7 +1010,9 @@ class FilesystemController(SubiquityController, FilesystemManipulator): capability_info = CapabilityInfo() for variation in self._variation_info.values(): gap = gaps.largest_gap(disk._reformatted()) - capability_info.combine(variation.capability_info_for_gap(gap)) + capability_info.combine( + variation.capability_info_for_gap(gap, install_min) + ) reformat = GuidedStorageTargetReformat( disk_id=disk.id, allowed=capability_info.allowed, @@ -1042,7 +1039,9 @@ class FilesystemController(SubiquityController, FilesystemManipulator): for variation in self._variation_info.values(): if variation.is_core_boot_classic(): continue - capability_info.combine(variation.capability_info_for_gap(gap)) + capability_info.combine( + variation.capability_info_for_gap(gap, install_min) + ) api_gap = labels.for_client(gap) use_gap = GuidedStorageTargetUseGap( disk_id=disk.id,