s6 support: add compatibility with old mode #950
Merged
Conversation
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
added 3 commits
November 18, 2025 08:10
In order to avoid breaking things for the 3 users who use the old s6 support, add compatibility. When command= is empty and a service directory exists in /var/svc.d, use that service directory instead of creating it from the service file data.
When the created notified pipe (often on 4) is the same number as the notification fd target, dup2() does not clear the FD_CLOEXEC flag, so the fd gets closed right when exec'ing the daemon, reporting readiness failure. Fix this by explicitly testing for the case and clearing the flag when necessary. Note that this happens because of a call to close_range() right before the test. close_range() is the real problem, it should never be used and this bug is a perfect illustration of why; but getting rid of close_range() is a much more invasive change that I don't want to commit to right now, especially since navi's plan is to eventually deprecate start-stop-daemon.
Now that the bug that made it fail is fixed, use the start-stop-daemon readiness notification mechanism when launching s6-svscan. (We do not run s6-svscan under supervise-daemon because that would needlessly lengthen the supervision chain. Yo dawg, we heard you like supervisors.)
Member
|
thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This change adds compatibility for people who use the old s6 support mechanism of OpenRC: it should fix the issue described in #949.
A service file with an empty
commandwill use a user-provided service directory with the same name as the service file in/var/svc.d, if one exists, rather than attempting to create a service directory from the information given in the service file.This PR also fixes a bug with the --notify fd:X option in
start-stop-daemon, and also ensures that s6-svscan is run with that option, now that the bug doesn't prevent it anymore.