Skip to content

internal/resource/url: support btrfs as OEM partition filesystem#21

Merged
pothos merged 1 commit intoflatcar-masterfrom
kai/btrfs-oem
Jul 28, 2021
Merged

internal/resource/url: support btrfs as OEM partition filesystem#21
pothos merged 1 commit intoflatcar-masterfrom
kai/btrfs-oem

Conversation

@pothos
Copy link
Copy Markdown
Member

@pothos pothos commented Jul 14, 2021

When btrfs is used to fit more content into the partition, mounting
fails because ext4 was hardcoded.
When mounting ext4 fails, try mounting as btrfs.

How to use/testing done

This was built and tested with the coreos-overlay branch kai/bootengine-verity-hashoffset from flatcar-archive/coreos-overlay#1106 and flatcar-scripts branch kai/btrfs-usr-oem from flatcar/scripts#131 in http://jenkins.infra.kinvolk.io:8080/job/os/job/manifest/3029/cldsv/ where the Flatcar image that has a btrfs /usr partition and OEM partition.
While the actual switch to a btrfs filesystem on the /usr partition is only possible when all changes are part of a Stable release because update-engine needs to know how to handle the new filesystem when updating, we can already do the switch for the OEM partition.

When btrfs is used to fit more content into the partition, mounting
fails because ext4 was hardcoded.
When mounting ext4 fails, try mounting as btrfs.
Copy link
Copy Markdown
Member

@jepio jepio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks sane to me but I'd ask someone with some more go experience to look at it.

@pothos
Copy link
Copy Markdown
Member Author

pothos commented Jul 15, 2021

Maybe good to know: The mount syscall doesn't have the auto option which libmount has, and we have to implement iterating over the filesystems directly.

@pothos pothos merged commit b80f06d into flatcar-master Jul 28, 2021
@pothos pothos deleted the kai/btrfs-oem branch July 28, 2021 11:20
pothos added a commit to flatcar-archive/coreos-overlay that referenced this pull request Jul 28, 2021
t-lo pushed a commit to flatcar/scripts that referenced this pull request Apr 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants