From 2a37f174becbafd70591f6eb1d98493c5c1df0e2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 May 2022 17:27:13 +0200 Subject: services: Make sure Shepherd destructors match constructors. This is a followup to b06ecc57515d4e3c8b2228e8142654e9a26ba6e1, 211fe3f66e6dfdaa64974931c458ab1d92afc182, and fd57ce267c4083fe98242caa31075d2bd62903bf. * gnu/services/base.scm (guix-publish-shepherd-service): Change 'stop' method to use 'make-systemd-destructor' when 'make-systemd-constructor' is used. * gnu/services/dict.scm (dicod-shepherd-service): Change 'stop' method to use 'make-inetd-destructor' when 'make-inetd-constructor' is used. * gnu/services/messaging.scm (bitlbee-shepherd-service): Likewise. --- gnu/services/base.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/services/base.scm') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index e324864744..bcec888587 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1914,7 +1914,10 @@ (define (config->compression-options config) (make-systemd-constructor #$command #$endpoints #$@options) (make-forkexec-constructor #$command #$@options))) - (stop #~(make-kill-destructor))))))) + (stop #~(if (and (defined? 'make-systemd-destructor) + #$(not advertise?)) + (make-systemd-destructor) + (make-kill-destructor)))))))) (define %guix-publish-accounts (list (user-group (name "guix-publish") (system? #t)) -- cgit v1.2.3