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.

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

Add ability to use plain squashfs as the iso rootfs #1105

Merged
merged 6 commits into from
Dec 17, 2024

Conversation

bcl
Copy link
Contributor

@bcl bcl commented Dec 12, 2024

No description provided.

@bcl bcl marked this pull request as draft December 13, 2024 00:06
@bcl
Copy link
Contributor Author

bcl commented Dec 13, 2024

It seems to be making f39 and f40 squashfs as well, which it isn't supposed to. Changing to a draft for now.

Copy link
Member

@ondrejbudai ondrejbudai left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks! 😍

pkg/image/image.go Outdated Show resolved Hide resolved
ondrejbudai
ondrejbudai previously approved these changes Dec 13, 2024
Copy link
Member

@ondrejbudai ondrejbudai left a comment

Choose a reason for hiding this comment

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

Thanks! :)

cgwalters
cgwalters previously approved these changes Dec 13, 2024
Copy link
Contributor

@cgwalters cgwalters 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 will do my usual thing that I think the OS content should drive partitioning.

pkg/distro/fedora/images.go Show resolved Hide resolved
@bcl bcl dismissed stale reviews from cgwalters and ondrejbudai via e24b33e December 13, 2024 22:00
@bcl bcl marked this pull request as draft December 14, 2024 00:58
@bcl
Copy link
Contributor Author

bcl commented Dec 14, 2024

Moving this back to draft for the moment, I need to move RootfsType into manifest instead of image to make it easier to add Erofs support later (it will need to switch out the Squashfs stage in anaconda_installer_iso_tree.go, I'll do that Monday.

bcl added 6 commits December 16, 2024 09:06
Fedora 41 and later, and RHEL 10 use plain squashfs instead of
compressing an ext4 filesystem.
This test assumed the image's static list of pipeline names must match
the manifest, but it really only needs to check the ones with rpm or
ostree metadata.

To support the ability to have images with different pipelines (eg.
squashfs only vs. ext4+squashfs rootfs iso creation) this changes the
test to make sure the pipelines in the static list are in the manifest,
and in the order specified. But the two lists do not need to match
exactly.
This pipeline is no longer used on Fedora 41 and later. They use a plain
squashfs install.img instead of wrapping an ext4 filesystem with
squashfs.

But it may be present in older versions, the test in distro_test.go has
been adjusted to ensure that all pipelines named are present and in the
correct order without requiring that this is an exact list of pipeline
names.
Make sure that the rootfs-image pipeline is present in ext4 images and
not present in squashfs only images.
@bcl bcl marked this pull request as ready for review December 16, 2024 17:50
@bcl
Copy link
Contributor Author

bcl commented Dec 16, 2024

Ok, this should be ready now. There followup to this later that will add erofs support instead of squashfs, but that's for later.

Copy link
Member

@achilleas-k achilleas-k left a comment

Choose a reason for hiding this comment

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

Cheers! This all LGTM.

pkg/distro/distro_test.go Show resolved Hide resolved
@bcl bcl added this pull request to the merge queue Dec 16, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 16, 2024
@bcl bcl added this pull request to the merge queue Dec 17, 2024
Merged via the queue into osbuild:main with commit 7b36025 Dec 17, 2024
18 of 19 checks passed
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.

4 participants