From patchwork Sun Jun 29 11:52:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43233 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 7B76027BC4B; Sun, 29 Jun 2025 13:40:48 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 F1E8727BC49 for ; Sun, 29 Jun 2025 13:40:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uVrKY-000447-Js; Sun, 29 Jun 2025 08:40:22 -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 1uVrKQ-0003rI-KT for guix-patches@gnu.org; Sun, 29 Jun 2025 08:40:16 -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 1uVrKQ-0002sq-A4 for guix-patches@gnu.org; Sun, 29 Jun 2025 08:40:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=KXjnjvxHi7asuwckgN31JZ2mQgWm0yk/eBL7H87lvZ8=; b=iOjdEs6lAWgxK4Sqv/Sl9/zHmYRg9ml+E68LNmwtnkzPAGLP7Pgtbj9fTc0Ayuu+EhUb+LNHEDx778aDG6nsPH+JUbccVaCFUOnOANDgV42IxEL+eraHCqguOi3KgtgazpsbcsH0+6RKlM9qhgbUntaDCSmlcidGLOZ38VijUn7pS0o4hjs+VSeKpPx3cJZoF3SHOP/7jhkOE/mtyyG8YNewm894cFMHzUEvmhyHdFnxclf9S65cKlYtkLo1X/J72aNYeVvPhEk1KFwczm4GWp4MIhcq1KhjD1YerfQ6UXeDlCEI8/KYH9KjWfInkWKs2SzAoM3hygcjGyfnk36pFA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uVqde-00044A-8m for guix-patches@gnu.org; Sun, 29 Jun 2025 07:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71064] [PATCH v2 1/2] gnu: services: nscd: Add nsncd optional support. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Jun 2025 11:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71064 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71064@debbugs.gnu.org Cc: picnoir@alternativebit.fr, ludo@gnu.org Received: via spool by 71064-submit@debbugs.gnu.org id=B71064.175119813615451 (code B ref 71064); Sun, 29 Jun 2025 11:56:02 +0000 Received: (at 71064) by debbugs.gnu.org; 29 Jun 2025 11:55:36 +0000 Received: from localhost ([127.0.0.1]:55286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uVqdD-00040z-Bk for submit@debbugs.gnu.org; Sun, 29 Jun 2025 07:55:36 -0400 Received: from 9.mo563.mail-out.ovh.net ([46.105.73.201]:33283) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uVqd8-0003zv-5y for 71064@debbugs.gnu.org; Sun, 29 Jun 2025 07:55:33 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bVSR42d5Vz6TSr; Sun, 29 Jun 2025 11:55:28 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for ; Sun, 29 Jun 2025 11:55:28 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.113.38]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bVSR41T6yz1xwC; Sun, 29 Jun 2025 11:55:28 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id DF9F4BA41DA; Sun, 29 Jun 2025 11:55:21 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-97G002ecae3bd8-1905-4665-972d-1d0ddb9771ff, 544AAD86FD78221F2F1F74AC97A45D17BD07B043) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 37.167.86.100 Date: Sun, 29 Jun 2025 13:52:40 +0200 Message-ID: <20250629115447.16729-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250629115447.16729-1-ngraves@ngraves.fr> References: <20250629115447.16729-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 3003900952829616861 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgdekjeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdefjedrudeijedrkeeirddutddtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepfedprhgtphhtthhopehpihgtnhhoihhrsegrlhhtvghrnhgrthhivhgvsghithdrfhhrpdhrtghpthhtohepjedutdeigeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehluhguohesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=KXjnjvxHi7asuwckgN31JZ2mQgWm0yk/eBL7H87lvZ8=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1751198128; v=1; b=wmfVaVIt0WVhRR8wCZrBsRXQJ8vAIP9w8Pr+ZH2+0z3iPnkBYwTYq/SDfWgMaW8D7yTtirjy CnD0VytZ2xCBc3C9iA7Y/dCfGeBLI/QQtV5Go6o7TAoxnsfva82pfbAGPwvvVW+PZ9xcoxSpRH/ Qf4eI6rwmYJa1OGrtq64NarEvJtN5MBxc5o0KkioRXOs48nQ/4vgMwnAIKAyXdy2RQyvy+xoxtS Li8Kn0a0Lk2FCmxMG9P0kZ/N77grkuRhp9L3GrZwzam/tKIdgl2j1YXK6rjSnemo479+RLuk9/y yGQN73gus6DH2ctUHEFnfzz1npNr3rR+X1l420Mzy7mug== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 From: Picnoir Add nsncd optional support for nscd-configuration. * gnu/services/base.scm (): Add implementation field. (nscd-shepherd-service-type)[start]: Update forkexec-constructor accordingly. Change-Id: I73d03bd149ff005130e1ed2532e1b4b0e3d572f5 --- gnu/services/base.scm | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 88dbcbf72a..a81bdf809c 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -84,6 +84,7 @@ (define-module (gnu services base) #:select (bcachefs-tools exfat-utils jfsutils zfs)) #:use-module (gnu packages fonts) #:use-module (gnu packages terminals) + #:use-module (gnu packages nss) #:use-module ((gnu packages wm) #:select (sway)) #:use-module ((gnu build file-systems) #:select (mount-flags->bit-mask @@ -1365,6 +1366,8 @@ (define-deprecated (mingetty-service config) (define-record-type* nscd-configuration make-nscd-configuration nscd-configuration? + (implementation nscd-implementation + (default 'glibc)) ;'glibc or 'nsncd (log-file nscd-configuration-log-file ;string (default #f)) (debug-level nscd-debug-level ;integer @@ -1543,12 +1546,20 @@ (define (nscd-shepherd-service config) (requirement '(user-processes syslogd)) (start #~(make-forkexec-constructor - (list #$nscd "-f" #$nscd.conf "--foreground") + #$(match (nscd-implementation config) + ('glibc + #~(list #$nscd "-f" #$nscd.conf "--foreground")) + ('nsncd + #~(list #$(file-append nsncd "/bin/nsncd")))) - ;; Wait for the PID file. However, the PID file is - ;; written before nscd is actually listening on its - ;; socket (XXX). - #:pid-file "/var/run/nscd/nscd.pid" + #$@(match (nscd-implementation config) + ('glibc + ;; Wait for the PID file. However, the PID file is + ;; written before nscd is actually listening on its + ;; socket (XXX). + #~(#:pid-file "/var/run/nscd/nscd.pid")) + ('nsncd + #~())) #:environment-variables (list (string-append "LD_LIBRARY_PATH="