Repository navigation
fix: skip s6-svwait in stage3 when there is no service - #38
Merged
Merged
Conversation
elglob without -0 kept the unmatched pattern, so s6-svwait got the literal /run/ignity/services-state/* and failed on every shutdown without services. Each service is now waited for in parallel, within the same grace time.
astral-sh/setup-uv and peter-evans/create-pull-request are restricted, use the techcode-io/github-actions proxies instead, as for setup-github-bot.
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.
What is the change being made?
stage3globs the services withelglob -0, so a scandir without services expands to nothing instead of the pattern itself.forx -p, ones6-svwait -Dper service), still bounded byIGNITY_SERVICES_GRACETIME. Without services there is nothing to wait for.test_boot.py) and with services (test_services.py) leaves nos6-svwaiterror.astral-sh/setup-uvandpeter-evans/create-pull-requestare replaced by theirtechcode-io/github-actionsproxies (setup-uv/v1,create-pull-request/v1), as already done forsetup-github-bot. Thesetup-uvproxy pins uv to 0.13.5 by default.Why is the change being made?
Downstream images without user services print on every shutdown:
Without
-0,elglobkeeps a pattern that matches nothing (.s6-svscanis skipped as a dotfile), ands6-svwaitgot the literal*. The bug was hidden until #34: the oldeltest -fcheck never ran the wait.astral-sh/setup-uvandpeter-evans/create-pull-requestare restricted actions: the proxies are the allowed way to use them.How has this been tested?
debian:bookworm-slim):sh -c 'exit 3'gives 3);servicesfixture: clean shutdown, exit code kept.uv run poe test, including the two new tests. The proxies are covered by this PR's CI run, butdependabot-plus-plus.ymlonly runs weekly or by hand (workflow_dispatch).How has this been documented?
No documentation change: the behaviour matches what is already documented.
Related Issues
None.