← Back to issue list

oci: handle opaque whiteouts in new layer (usrmerge)

View original Github issue

Metadata

Project
rockcraft
Number
#163
Type
pull request
State
merged
Author
tigarmo
Labels
—
Created
Updated
Closed

Current evaluation

Merged as commit 501e6eae, adding opaque-whiteout handling so usrmerge layers can explicitly hide base-layer symlinks while preserving them otherwise.

Resolution: closed resolved

Reason: PR #163 was approved and merged into main as commit 501e6eae, resolving CRAFT-1527. The change updates OCI layer creation and tests to emit opaque whiteouts for explicit removals.

Evaluated by: mr-cal-bot

No scores available.

Issue body

Now that add_layer() looks at the base, improve its logic to support *explicit* removals/hiding of base layer symlinks. With this change, regular directories created by lifecycle's "build" step will respect symlinks in the base layer, but removals via overlay-scripts will hide those symlinks. (CRAFT-1527)

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved Merged as commit 501e6eae, adding opaque-whiteout handling so usrmerge layers can explicitly hide base-layer symlinks while preserving them otherwise.
stealth/space-bunny-alpha — closed resolved Merged CRAFT-1527: OCI add_layer() now respects base-layer symlinks while allowing opaque whiteouts from overlay scripts to hide them.
qwen/qwen3.6-35b-a3b — — Merged. Updates add_layer() to handle opaque whiteouts and explicit symlink removals, ensuring overlay-script removals properly hide base layer symlinks. Approved by two reviewers, passed CI, and modified five files.
qwen3.6-35b-a3b-mtp-q6 — — Merged update to add_layer() handling opaque whiteouts for explicit base layer symlink removals. Regular directories now respect base symlinks while overlay-script removals properly hide them, resolving CRAFT-1527.

Update history

No update history recorded yet.

Related issues

Issue Project State Summary Similarity
#274 migration: filter out unnecessary whiteout files craft-parts merged Merged PR #274 as commit ea2f679a, filtering OCI whiteout files and opaque-directory markers from prime when the base layer has nothing to remove.
71%
#115 overlay: add layer visibility helpers (CRAFT-477) craft-parts merged Merged PR #115 in commit 0cd9d342, adding overlay layer visibility helpers that account for whiteout entries and opaque directories.
71%