Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GPT header rework - Refacto 2 #234

Merged
merged 12 commits into from
Jul 24, 2024
Merged

GPT header rework - Refacto 2 #234

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
835d9f9
Use the system-data role to look for the rootfs structure
upils Jul 2, 2024
afa5f91
Fix calculateRootfsSize
upils Jul 2, 2024
281fc3e
Fix TestCalculateRootfsSizeImageSize following bug fixing on calculat…
upils Jul 2, 2024
fed29d2
Tweak TestImageSizeFlag
upils Jul 2, 2024
18a9969
Refactor calculateRootfsSize
upils Jul 3, 2024
7a8430e
Improve and use more isRootfsStructure
upils Jul 3, 2024
1a4c775
Improve TestImageSizeFlag to not rely on flag parsing
upils Jul 3, 2024
c6f768a
Improve functions/methods docs
upils Jul 3, 2024
ea98ccb
Only warn if rootfs bigger than image-size
upils Jul 4, 2024
cc9c29d
Update mkfs conf for oracular
upils Jul 3, 2024
dc57342
Adapt TestFailedCalculateRootfsSize to calculateRootfsSize
upils Jul 17, 2024
46f65b8
Remove mkfs unsupported mantic conf
upils Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use the system-data role to look for the rootfs structure 
Signed-off-by: Paul Mars <paul.mars@canonical.com>
  • Loading branch information
@upils
upils committed Jul 17, 2024
commit 835d9f991b320b166985964c5c3a2d2f8991e619
4 changes: 2 additions & 2 deletions internal/statemachine/common_states.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func (stateMachine *StateMachine) calculateRootfsSize() error {
func (stateMachine *StateMachine) findRootfsVolume() (*gadget.Volume, string) {
for volumeName, volume := range stateMachine.GadgetInfo.Volumes {
for _, structure := range volume.Structure {
if structure.Size == 0 {
if structure.Role == gadget.SystemData {
return volume, volumeName
}
}
Expand All @@ -207,7 +207,7 @@ func (stateMachine *StateMachine) alignToSectorSize(size quantity.Size) quantity
func (stateMachine *StateMachine) syncGadgetStructureRootfsSize() {
for _, volume := range stateMachine.GadgetInfo.Volumes {
for structIndex, structure := range volume.Structure {
if structure.Size == 0 {
if structure.Role == gadget.SystemData {
structure.Size = stateMachine.RootfsSize
}
volume.Structure[structIndex] = structure
Expand Down