Skip to content

build.sh: move chmod /usr/lib/containers/storage/overlay-* to install_rpms #4322

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

Merged
jlebon merged 2 commits into from
Sep 16, 2025
Merged

build.sh: move chmod /usr/lib/containers/storage/overlay-* to install_rpms #4322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afcb4d0
plume/release: drop metadata URL check
jlebon Sep 15, 2025
49784b8
build.sh: move chmod /usr/lib/containers/storage/overlay-* to `instal…
jlebon Sep 15, 2025
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
9 changes: 4 additions & 5 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ install_rpms() {
fi
# Similarly for kernel data and SELinux policy, which we want to inject into supermin
chmod -R a+rX /usr/lib/modules /usr/share/selinux/targeted
# And a few more from the containers stack we want to inject into supermin too.
# Remove when https://github.com/containers/common/pull/2507 has merged
chmod 755 /usr/lib/containers/storage/overlay-images
chmod 755 /usr/lib/containers/storage/overlay-layers

# Symlink the CentOS Stream GPG keys to /etc to make it easier to build
# CentOS-based artifacts.
Expand Down Expand Up @@ -177,11 +181,6 @@ configure_user(){
# Lifted from: https://github.com/containers/podman/blob/6e382d9ec2e6eb79a72537544341e496368b6c63/contrib/podmanimage/stable/Containerfile#L25-L26
echo -e "builder:1:999\nbuilder:1001:64535" > /etc/subuid
echo -e "builder:1:999\nbuilder:1001:64535" > /etc/subgid

# Allow a few directories to be accessed by unprivileged users.
# Remove when https://github.com/containers/common/pull/2507 has merged
chmod 755 /usr/lib/containers/storage/overlay-images
chmod 755 /usr/lib/containers/storage/overlay-layers
}

write_archive_info() {
Expand Down
2 changes: 1 addition & 1 deletion mantle/cmd/plume/release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@
}

func compareStaticReleaseInfo(a, b release.IndexRelease) bool {
if a.Version != b.Version || a.MetadataURL != b.MetadataURL {
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Sep 15, 2025

Choose a reason for hiding this comment

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

high

This change seems unrelated to the PR's stated goal of modifying build.sh. Removing the MetadataURL comparison is a significant logical change that could have unintended side effects. Could you please explain the reasoning for this? It would be best to revert this change and submit it as a separate pull request with a proper description and justification.

if a.Version != b.Version {

Check failure on line 371 in mantle/cmd/plume/release.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

S1008: should use 'return a.Version == b.Version' instead of 'if a.Version != b.Version { return false }; return true' (gosimple)
return false
}
return true
Expand Down
Loading