From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#28128] [PATCH 1/2] shepherd: Move nscd-socket to (gnu system file-systems). Resent-Message-ID: From: Arun Isaac Date: Wed, 13 Mar 2019 15:06:09 +0530 Message-Id: <20190313093610.1071-2-arunisaac@systemreboot.net> In-Reply-To: <20190313093610.1071-1-arunisaac@systemreboot.net> References: <20190313093610.1071-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: ludo@gnu.org Cc: 28128@debbugs.gnu.org * 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." -- 2.20.1