Hello Ludo, This is a big improvement, thank you! > + (lambda args > + (if (= ENOSYS (system-error-errno args)) > + #f > + (apply throw args))))) Maybe: (and (= ENOSYS (system-error-errno args)) (apply throw args)) > + > +(define (handle-signal-port port) > + "Read from PORT, a signalfd port, and handle the signal accordingly." > + (let ((signal (consume-signalfd-siginfo port))) > + (cond ((= signal SIGCHLD) > + (handle-SIGCHLD)) > + ((= signal SIGINT) > + (catch 'quit > + (lambda () > + (stop root-service)) > + quit-exception-handler)) Maybe we should create a handle-SIGINT, to make sure that the same code is shared with the sigaction handler? > + (begin > + ;; Unblock any signals that might have been blocked by the parent > + ;; process. > + (unblock-signals (list SIGCHLD SIGINT SIGHUP SIGTERM)) This made me realize that we may want to disable/reset SIGINT and SIGHUP, in the same way that we do for SIGTERM? This is not related to your patch anyway. You could also extend the comment to say that it is only necessary if using the signalfd mechanism (because signals are not blocked otherwise). In any case, this looks fine! Thanks, Mathieu