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

Make squashfs defaults more consistent #2040

Merged
merged 1 commit into from
Apr 10, 2024

Conversation

davidcassany
Copy link
Contributor

This PR makes ensures squashfs compression can be disabled and leaves the default compression to what used to be the case for squash-no-compression: true. Default compression then defaults to default mksquashfs compression (gzip) with a block of 1024k.

Signed-off-by: David Cassany <dcassany@suse.com>
@davidcassany davidcassany requested a review from a team as a code owner April 10, 2024 12:44
@davidcassany
Copy link
Contributor Author

The result is that where ever squash-no-compression option was used it can be removed with the same result. Also the tests that where using the no compression option now should really result in non compressed images.

options = append(options, "x86")
}
return options
return []string{"-b", "1024k"}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Use default mksquashfs compression with a block of 1024k bytes

Copy link
Member

@fgiudici fgiudici 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 here!

Copy link
Contributor

@frelon frelon left a comment

Choose a reason for hiding this comment

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

LGTM!

@davidcassany davidcassany merged commit 7feca1f into rancher:main Apr 10, 2024
17 checks passed
@davidcassany davidcassany deleted the change_squashfs_defaults branch April 10, 2024 13:08
@davidcassany davidcassany added this to the Micro6 milestone Apr 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants