Skip to content

glibc: better support ldconfig trigger with different shells#45154

Merged
xnox merged 2 commits into
wolfi-dev:mainfrom
xnox:scriplet-more-fixes
Mar 8, 2025
Merged

glibc: better support ldconfig trigger with different shells#45154
xnox merged 2 commits into
wolfi-dev:mainfrom
xnox:scriplet-more-fixes

Conversation

@xnox
Copy link
Copy Markdown
Member

@xnox xnox commented Mar 7, 2025

apk-tools orders triggers in runtime dependency order, meaning glibc
trigger is guaranteed to execute before busybox trigger sets up "sh"
symlink.

Move glibc trigger to apk-tools post-commit hook, such that it is
executed after all triggers have been fired, to ensure shell is
accessible.

Separately, will submit glibc upstream feature change to make it
possible to use "#!/usr/bin/ldconfig.trigger" as a trigger which
ignores all arguments.

Add test cases to verify that bootstraps work with various shells.

@xnox xnox requested a review from a team as a code owner March 7, 2025 13:17
@octo-sts octo-sts Bot added the bincapz/pass bincapz/pass Bincapz (aka. malcontent) scan didn't detect any CRITICALs on the scanned packages. label Mar 7, 2025
apk-tools orders triggers in runtime dependency order, meaning glibc
trigger is guaranteed to execute before busybox trigger sets up "sh"
symlink.

Move glibc trigger to apk-tools post-commit hook, such that it is
executed after all triggers have been fired, to ensure shell is
accessible.

Separately, will submit glibc upstream feature change to make it
possible to use "#!/usr/bin/ldconfig.trigger" as a trigger which
ignores all arguments.

Add test cases to verify that bootstraps work with various shells.
@xnox xnox force-pushed the scriplet-more-fixes branch from 1c90c0f to d931eb2 Compare March 7, 2025 15:51
dannf
dannf previously approved these changes Mar 7, 2025
Copy link
Copy Markdown
Member

@dannf dannf left a comment

Choose a reason for hiding this comment

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

thanks!

@xnox xnox requested a review from dannf March 7, 2025 22:15
@xnox
Copy link
Copy Markdown
Member Author

xnox commented Mar 7, 2025

@dannf there was lint failure, which is now fixed. Please re-review.

@dannf
Copy link
Copy Markdown
Member

dannf commented Mar 7, 2025

approved :) but maybe wait until Monday to merge?

@xnox
Copy link
Copy Markdown
Member Author

xnox commented Mar 8, 2025

approved :) but maybe wait until Monday to merge?

we do release to prod on Fridays =)

@xnox xnox merged commit c380137 into wolfi-dev:main Mar 8, 2025
jakeva pushed a commit to jakeva/os that referenced this pull request Mar 23, 2026
Co-authored-by: staging-update-bot <staging-update-bot@chainguard.dev>

Export:  dc8777c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bincapz/pass bincapz/pass Bincapz (aka. malcontent) scan didn't detect any CRITICALs on the scanned packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants