Support systemd socket activation with multiple sockets#7892
Merged
Ericson2314 merged 1 commit intoNixOS:masterfrom Feb 2, 2026
Merged
Support systemd socket activation with multiple sockets#7892Ericson2314 merged 1 commit intoNixOS:masterfrom
Ericson2314 merged 1 commit intoNixOS:masterfrom
Conversation
Ericson2314
requested review from
edolstra and
fricklerhandwerk
as code owners
Member
Author
|
Will need to fix macOS failure. |
Ericson2314
force-pushed
the
systemd-multi-socket
branch
from
f38006b to
9aedd37
Compare
Ericson2314
force-pushed
the
systemd-multi-socket
branch
2 times, most recently
from
310266c to
ab3a602
Compare
Ericson2314
force-pushed
the
systemd-multi-socket
branch
from
ab3a602 to
864ff3d
Compare
Ericson2314
force-pushed
the
systemd-multi-socket
branch
from
864ff3d to
8f86ec8
Compare
Ericson2314
changed the title
Ericson2314
force-pushed
the
systemd-multi-socket
branch
from
8f86ec8 to
2ca1703
Compare
Ericson2314
force-pushed
the
systemd-multi-socket
branch
from
2ca1703 to
8a532e2
Compare
Member
Author
|
I'm hoping that not passing |
tomberek
reviewed
Jan 30, 2026
src/nix/unix/daemon.cc
Outdated
| if (errno == EINTR) | ||
| continue; | ||
| throw SysError("accepting connection"); | ||
| throw SysError("poll"); |
We now support `LISTEN_FDS` values greater than 1, per the systemd socket activation spec. These changes are by @edolstra, taken from NixOS#5265. This is just that PR *without* the TCP parts, which I gathered are the controversial parts. Hopefully this remainder is not so controversial. Review with indentation ignored, because some code has moved inside a new loop but otherwise is mostly unchanged.
Ericson2314
force-pushed
the
systemd-multi-socket
branch
from
8a532e2 to
a2de09c
Compare
edolstra
approved these changes
Feb 2, 2026
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
3 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.
Motivation
We now support
LISTEN_FDSvalues greater than 1, per the systemd socket activation spec.Context
These changes are by @edolstra, taken from #5265. This is just that PR without the TCP parts, which I gathered are the controversial parts. Hopefully this remainder is not so controversial.
Review with indentation ignored, because some code has moved inside a new loop but otherwise is mostly unchanged.
Checklist for maintainers
Maintainers: tick if completed or explain if not relevant
tests/**.shsrc/*/teststests/nixos/*