[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#28128] [PATCH 1/2] shepherd: Move nscd-socket to (gnu system file-s
From: |
Arun Isaac |
Subject: |
[bug#28128] [PATCH 1/2] shepherd: Move nscd-socket to (gnu system file-systems). |
Date: |
Wed, 13 Mar 2019 15:06:09 +0530 |
* 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 <address@hidden>
+;;; Copyright © 2019 Arun Isaac <address@hidden>
;;;
;;; 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
<address@hidden>
+;;; Copyright © 2019 Arun Isaac <address@hidden>
;;;
;;; 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
- [bug#28128] [PATCH 0/2] Support container network sharing, Arun Isaac, 2019/03/13
- [bug#28128] [PATCH 2/2] scripts: system: Support container network sharing., Arun Isaac, 2019/03/13
- [bug#28128] [PATCH 2/2] scripts: system: Support container network sharing., Ludovic Courtès, 2019/03/13
- [bug#28128] [PATCH 2/2] scripts: system: Support container network sharing., Arun Isaac, 2019/03/14
- [bug#28128] [PATCH 2/2] scripts: system: Support container network sharing., Ludovic Courtès, 2019/03/18
- [bug#28128] [PATCH 2/2] scripts: system: Support container network sharing., Arun Isaac, 2019/03/21
- Message not available
- [bug#28128] [PATCH 2/2] scripts: system: Support container network sharing., Ludovic Courtès, 2019/03/22
- [bug#28128] [PATCH 2/2] scripts: system: Support container network sharing., Arun Isaac, 2019/03/25
[bug#28128] [PATCH 1/2] shepherd: Move nscd-socket to (gnu system file-systems).,
Arun Isaac <=