civodul pushed a commit to branch main
in repository shepherd.
commit 82a333f8e83b4abbd19dbc6c9bab1b7d62cced0c
Author: Ludovic Courtès <l...@gnu.org>
AuthorDate: Thu Apr 10 23:03:57 2025 +0200
service: ‘check-for-dead-services’ calls ‘process-id’ as needed.
This is a followup to 4e3b58e5cdc3fd3c0448f631fc4983224aafc347.
On GNU/Hurd this would lead to a ‘tests/forking-service.sh’ failure.
* modules/shepherd/service.scm (check-for-dead-services): Add two
missing calls to ‘process-id’.
Reported-by: yelninei <yelni...@tutamail.com>
---
modules/shepherd/service.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/shepherd/service.scm b/modules/shepherd/service.scm
index 85daac0..654506d 100644
--- a/modules/shepherd/service.scm
+++ b/modules/shepherd/service.scm
@@ -2815,7 +2815,8 @@ where prctl/PR_SET_CHILD_SUBREAPER is unsupported."
(when (and (process? running)
(not (process-exists? (process-id
running))))
(local-output (l10n "PID ~a (~a) is dead!")
- running (service-canonical-name
service))
+ (process-id running)
+ (service-canonical-name service))
;; Tell the process monitor, which in turn will
;; forward it to the service. The status is
@@ -2823,7 +2824,8 @@ where prctl/PR_SET_CHILD_SUBREAPER is unsupported."
;; so provide an arbitrary value. Terrible.
(put-message (current-process-monitor)
`(handle-process-termination
- ,running ,(ash 77 8))))))))
+ ,(process-id running)
+ ,(ash 77 8))))))))
(define %post-daemonize-hook
;; Hook invoked after the 'daemonize' action in the child process.
