From patchwork Wed Mar 13 09:36:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 1409 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 394C216CCC; Wed, 13 Mar 2019 09:46:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D6D8F169F6 for ; Wed, 13 Mar 2019 09:46:57 +0000 (GMT) Received: from localhost ([127.0.0.1]:41183 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h40TR-0003At-Bm for patchwork@mira.cbaines.net; Wed, 13 Mar 2019 05:46:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h40QY-0000a0-Aw for guix-patches@gnu.org; Wed, 13 Mar 2019 05:43:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h40Jq-0000AQ-Ga for guix-patches@gnu.org; Wed, 13 Mar 2019 05:37:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55723) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h40Jq-0000AM-CK for guix-patches@gnu.org; Wed, 13 Mar 2019 05:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h40Jq-0000XO-9a for guix-patches@gnu.org; Wed, 13 Mar 2019 05:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#28128] [PATCH 1/2] shepherd: Move nscd-socket to (gnu system file-systems). Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Mar 2019 09:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28128 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: ludo@gnu.org Received: via spool by 28128-submit@debbugs.gnu.org id=B28128.15524698002020 (code B ref 28128); Wed, 13 Mar 2019 09:37:02 +0000 Received: (at 28128) by debbugs.gnu.org; 13 Mar 2019 09:36:40 +0000 Received: from localhost ([127.0.0.1]:41031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h40JU-0000WP-01 for submit@debbugs.gnu.org; Wed, 13 Mar 2019 05:36:40 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:41636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h40JL-0000Vy-Nf for 28128@debbugs.gnu.org; Wed, 13 Mar 2019 05:36:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Zu0CqmsR0Fk7BmwIlj9MBeGJ9FN6d7ShS+hW/DAy0uE=; b=bsUw8TxsfeMlgI6KPhodaUz5EQ OHl8OvX095QiQJWDAleJ//3bf9jWfemq4jgoc1kOfaWvZMSMAL0l13AO4GhxrQu0FXobuhDdJpuW9 yZTSoh1qUCfFGlpc58mNtdFz9/CTllXAXeB8G6+UP3wi2sMaHV6kW/3VmOz5Y4m7pkMc=; Received: from [14.139.128.10] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.91) (envelope-from ) id 1h40JH-0004bl-JD; Wed, 13 Mar 2019 15:06:27 +0530 From: Arun Isaac Date: Wed, 13 Mar 2019 15:06:09 +0530 Message-Id: <20190313093610.1071-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190313093610.1071-1-arunisaac@systemreboot.net> References: <20190313093610.1071-1-arunisaac@systemreboot.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 28128@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/build/shepherd.scm (default-mounts)[nscd-socket]: Move to ... * gnu/system/file-systems.scm (%nscd-socket-mapping): ... here. --- gnu/build/shepherd.scm | 8 ++------ gnu/system/file-systems.scm | 10 +++++++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/build/shepherd.scm b/gnu/build/shepherd.scm index f383259924..b3fc1f9c72 100644 --- a/gnu/build/shepherd.scm +++ b/gnu/build/shepherd.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Ludovic Courtès +;;; Copyright © 2019 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,15 +68,10 @@ (file-system-mapping (source "/etc/group") (target source)))) - (define nscd-socket - (file-system-mapping - (source "/var/run/nscd") (target source) - (writable? #t))) - (append (cons (tmpfs "/tmp") %container-file-systems) (let ((mappings `(,@(if (memq 'net namespaces) '() - (cons nscd-socket + (cons %nscd-socket-mapping %network-file-mappings)) ,@(if (and (memq 'mnt namespaces) (not (memq 'user namespaces))) diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 393dd0df70..4cf4f6608b 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2019 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,7 +77,8 @@ %store-mapping %network-configuration-files - %network-file-mappings)) + %network-file-mappings + %nscd-socket-mapping)) ;;; Commentary: ;;; @@ -510,6 +512,12 @@ a bind mount." (writable? (string=? file "/etc/resolv.conf")))) %network-configuration-files)) +(define %nscd-socket-mapping + (file-system-mapping + (source "/var/run/nscd") + (target source) + (writable? #t))) + (define (file-system-type-predicate type) "Return a predicate that, when passed a file system, returns #t if that file system has the given TYPE."