Use the first fitting gap for ESP, instead of the largest gap #1765
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dbungert
approved these changes
Aug 17, 2023
| @@ -252,6 +252,14 @@ def largest_gap_size(device, in_extended=None): | |||
| return 0 | |||
|
|
|||
|
|
|||
| def gap_with_size(device, size, *, in_extended=None): | |||
| for pg in parts_and_gaps(device): | |||
There was a problem hiding this comment.
gap_with_size sounds like any gap will do that fits the requirement, or maybe even the closest gap (first gap is large, second gap is small but large enough, choose the second). Would you add a docstring clarifying intent?
There was a problem hiding this comment.
I changed the method name to 'first_gap_with_size'. For this use case, finding the smallest suitable gap might actually make more sense but well. Minor stuff I think.
subiquity/common/filesystem/boot.py
Outdated
| @@ -224,7 +224,7 @@ def get_add_part_plan(device, *, spec, args, resize_partition=None): | |||
| # is a bad idea. So avoid putting any sort of boot stuff on a logical - | |||
| # it's probably a bad idea for all cases. | |||
|
|
|||
| gap = gaps.largest_gap(device, in_extended=False) | |||
| gap = gaps.gap_with_size(device, size, in_extended=False) | |||
| if gap is not None and gap.size >= size and gap.is_usable: | |||
There was a problem hiding this comment.
Some of the logic is redundant now
dbungert
approved these changes
Aug 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is basically @medicalwei's #1764 with potentially useful functionality factored into a method.