From patchwork Wed May 22 14:53:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 64825 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 74D7027BBEA; Wed, 22 May 2024 15:55:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 EB99D27BBE2 for ; Wed, 22 May 2024 15:55:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9nMq-0005Se-DB; Wed, 22 May 2024 10:55:00 -0400 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 1s9nMo-0005Rd-6p for guix-patches@gnu.org; Wed, 22 May 2024 10:54:58 -0400 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 1s9nMn-0007ZW-UQ for guix-patches@gnu.org; Wed, 22 May 2024 10:54:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s9nMt-0003vV-NN for guix-patches@gnu.org; Wed, 22 May 2024 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71118] [PATCH 4/5] services: avahi: Use socket activation and log to stderr. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 May 2024 14:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71118@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 71118-submit@debbugs.gnu.org id=B71118.171638965115047 (code B ref 71118); Wed, 22 May 2024 14:55:03 +0000 Received: (at 71118) by debbugs.gnu.org; 22 May 2024 14:54:11 +0000 Received: from localhost ([127.0.0.1]:56430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nM3-0003uX-82 for submit@debbugs.gnu.org; Wed, 22 May 2024 10:54:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nLy-0003t4-9p for 71118@debbugs.gnu.org; Wed, 22 May 2024 10:54:06 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s9nLn-0007S8-5t; Wed, 22 May 2024 10:53:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=GORMkBKHm0X3E7XZXTrV1X0/6lbmwHkT/NS4V/brjP8=; b=ZlgdnpGOaiPWhNPhGMKS LtBqahMdZZ7WwcfcnkydTv313BGtVRCDUd4UG1rjU2xAyI87WakjIigsRVHU2Ug6p6eV0pLPAq9iw Q2XJnd8VU4KpsrmNwX1ux+8QcjmPf015Trvf1JgfKry8TXVThpEPZOxkGxfS+pIRacHInhzyJ3cH5 2awiHQQMCMoCtnvD5TNjWqanxCkiF1hAOs6WpJiuhwwGMyxyRjX7Sy0EGeHRfD7OSYK9Ojqo8GJVN syPyeHIwr3R/AsXA3E4FciB7zuLva/ov9LkOSNXnPi7bvCYEXxukPuoW2XIewOxVcQITCVlwPG7XE /5AJRg1p2jTJcQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 22 May 2024 16:53:39 +0200 Message-ID: <4c2a4c6f80531b1e051c00c9d2f12cfec8dcf85b.1716386553.git.ludo@gnu.org> 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/avahi.scm (avahi-shepherd-service): Change to systemd style. Remove ‘--daemonize’ option and #:pid-file. Add #:lazy-start? and #:log-file. Change-Id: I1915243f057ff3bbe281f46f17826f24b124f659 --- gnu/services/avahi.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm index 1c4220e490b..9352492bbda 100644 --- a/gnu/services/avahi.scm +++ b/gnu/services/avahi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2020, 2022 Ludovic Courtès +;;; Copyright © 2014-2020, 2022, 2024 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -131,13 +131,17 @@ (define (avahi-shepherd-service config) (provision '(avahi-daemon)) (requirement '(user-processes dbus-system networking)) - (start #~(make-forkexec-constructor + (start #~(make-systemd-constructor (list #$(file-append avahi "/sbin/avahi-daemon") - "--daemonize" #$@(if debug? #~("--debug") #~()) "-f" #$config) - #:pid-file "/run/avahi-daemon/pid")) - (stop #~(make-kill-destructor)) + (list (endpoint + (make-socket-address + AF_UNIX + "/run/avahi-daemon/socket"))) + #:lazy-start? #f + #:log-file "/var/log/avahi-daemon.log")) + (stop #~(make-systemd-destructor)) (actions (list (shepherd-configuration-action config))))))) (define avahi-service-type