Merged
Conversation
GitHub Actions artifact upload/download strips file permissions, causing containerd, runc, nerdctl, and CNI plugin binaries to lose their execute bit. This results in 'Permission denied' errors when systemd tries to start containerd.service inside the booted ISO. Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
Reduces top-level clutter in mkosi.output/ by nesting the staging
directory inside iso/{ver}/{arch}/staging instead of maintaining a
separate iso-staging/ tree.
Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
There was a problem hiding this comment.
Pull request overview
This PR updates the build output layout by nesting ISO staging under the ISO output directory, and addresses CI/tooling issues where downloaded tool artifacts lose executable permissions—leading to runtime failures in the built initramfs/ISO.
Changes:
- Move ISO staging from a top-level
mkosi.output/iso-staging/...tree tomkosi.output/iso/{version}/{arch}/staging/. - Restore execute permissions on tool binaries during mkosi finalize (and additionally in CI after artifact download).
- Remove references to
iso-stagingfrom Docker ownership fixes and cleanup commands.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| mkosi.finalize | Re-applies executable bits for tool binaries inside the mkosi buildroot. |
| captain/iso.py | Updates ISO layout documentation to reflect nested staging directory. |
| captain/config.py | Changes iso_staging path to be under iso_output/staging. |
| captain/cli/_stages.py | Stops fixing ownership of the removed top-level iso-staging path. |
| captain/cli/_commands.py | Removes iso-staging from clean targets/patterns. |
| .github/workflows/ci.yml | Adds a step to restore tool binary execute permissions after downloading artifacts. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
97 tasks
Contributor
Merge Queue Status
This pull request spent 11 minutes 57 seconds in the queue, including 11 minutes 43 seconds running CI. Required conditions to merge
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
move iso-staging under iso/ directory. Reduces top-level clutter in mkosi.output/ by nesting the staging directory inside iso/{ver}/{arch}/staging instead of maintaining a separate iso-staging/ tree.
restore execute permissions on tool binaries. GitHub Actions artifact upload/download strips file permissions, causing containerd, runc, nerdctl, and CNI plugin binaries to lose their execute bit. This results in 'Permission denied' errors when systemd tries to start containerd.service inside the booted ISO.
Fixes: #
How Has This Been Tested?
How are existing users impacted? What migration steps/scripts do we need?
Checklist:
I have: