aboutsummaryrefslogtreecommitdiff
path: root/src/nix
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2021-10-05 13:23:16 +0200
committerEelco Dolstra <edolstra@gmail.com>2021-10-05 13:23:16 +0200
commitb14bc06955885f661e4af5f04513086d74f2cab7 (patch)
tree2d840c1f19ad6691e826ad9cec6b34bcdb010183 /src/nix
parente4a5d64a81bcefe8a08015a877492235b079a9e2 (diff)
Don't ignore SIGCHLD in createUnixDomainSocket()
Diffstat (limited to 'src/nix')
-rw-r--r--src/nix/daemon.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nix/daemon.cc b/src/nix/daemon.cc
index 2cf2a04c9..6a40a0bd3 100644
--- a/src/nix/daemon.cc
+++ b/src/nix/daemon.cc
@@ -156,9 +156,6 @@ static void daemonLoop()
if (chdir("/") == -1)
throw SysError("cannot change current directory");
- // Get rid of children automatically; don't let them become zombies.
- setSigChldAction(true);
-
AutoCloseFD fdSocket;
// Handle socket-based activation by systemd.
@@ -176,6 +173,9 @@ static void daemonLoop()
fdSocket = createUnixDomainSocket(settings.nixDaemonSocketFile, 0666);
}
+ // Get rid of children automatically; don't let them become zombies.
+ setSigChldAction(true);
+
// Loop accepting connections.
while (1) {