From patchwork Tue Nov 7 15:04:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 56015 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5BBCA27BBE9; Tue, 7 Nov 2023 15:06:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4E3A027BBE2 for ; Tue, 7 Nov 2023 15:06:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0Neu-0004lH-CP; Tue, 07 Nov 2023 10:06:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Nes-0004kg-F6 for guix-patches@gnu.org; Tue, 07 Nov 2023 10:06:26 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0Ner-0001Fl-6S for guix-patches@gnu.org; Tue, 07 Nov 2023 10:06:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r0NfT-0001XN-4M for guix-patches@gnu.org; Tue, 07 Nov 2023 10:07:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66935] [PATCH v2 1/4] services: dovecot: Use make-kill-destructor for action stop. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Nov 2023 15:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66935 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66935@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 66935-submit@debbugs.gnu.org id=B66935.16993695885841 (code B ref 66935); Tue, 07 Nov 2023 15:07:03 +0000 Received: (at 66935) by debbugs.gnu.org; 7 Nov 2023 15:06:28 +0000 Received: from localhost ([127.0.0.1]:43030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Net-0001W9-Me for submit@debbugs.gnu.org; Tue, 07 Nov 2023 10:06:27 -0500 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:47066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0Nes-0001W1-4n for 66935@debbugs.gnu.org; Tue, 07 Nov 2023 10:06:26 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 5CB9C20CD8 for <66935@debbugs.gnu.org>; Tue, 7 Nov 2023 16:05:47 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id C6C2A80098; Tue, 7 Nov 2023 16:05:33 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Ir4auNSYHDhY; Tue, 7 Nov 2023 16:05:33 +0100 (CET) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 53FDC80092; Tue, 7 Nov 2023 16:05:33 +0100 (CET) From: Bruno Victal Date: Tue, 7 Nov 2023 15:04:49 +0000 Message-ID: <2636b2830120d4f02ba2011d363fd8e5296e4bfd.1699369492.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/mail.scm (dovecot-shepherd-service): Prefer file-append over string-append. Prefer shepherd mechanism for issuing stop action. Change-Id: I6a23fbb70ee4e0a2ba5f8e933e85b97283736f5d --- gnu/services/mail.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) base-commit: fb46c1cedab5d00e6afac46bfa514094d5c9e13f diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 12dcc8e71d..b865a67630 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -1580,12 +1580,9 @@ (define (dovecot-shepherd-service config) (provision '(dovecot)) (requirement '(pam networking)) (start #~(make-forkexec-constructor - (list (string-append #$dovecot "/sbin/dovecot") + (list #$(file-append dovecot "/sbin/dovecot") "-F"))) - (stop #~(lambda _ - (invoke #$(file-append dovecot "/sbin/dovecot") - "stop") - #f)))))) + (stop #~(make-kill-destructor)))))) (define %dovecot-pam-services (list (unix-pam-service "dovecot")))