StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

storage: classic and core have same minsize answer

This commit is contained in:
Dan Bungert 2023-08-31 14:35:46 -06:00
parent 727d395b5f
commit 224d9b5919
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
subiquity/server/controllers/filesystem.py
View File

@ -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,