diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-12 22:17:43 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-12 23:07:42 +0200 |
| commit | 5ccec77176b7e0c67ed58c8849e5e76f3dd79a88 (patch) | |
| tree | c2979713d92479d096ec4133f6b1c2457539dd2c /gnu/build | |
| parent | f58b2f38e4dfdbb8473fb2816d44fae6ad9cbc79 (diff) | |
| download | guix-patches-5ccec77176b7e0c67ed58c8849e5e76f3dd79a88.tar guix-patches-5ccec77176b7e0c67ed58c8849e5e76f3dd79a88.tar.gz | |
file-systems: Add /var/run/nscd to '%network-file-mappings'.
This allows containers created by "guix environment -CN" or by
"guix system container -N" to talk to the host nscd.
* gnu/system/file-systems.scm (%network-file-mappings): Add
"/var/run/nscd".
* gnu/build/shepherd.scm (default-mounts)[nscd-socket]: Remove.
* gnu/system/linux-container.scm (container-script)[nscd-run-directory]
[nscd-mapping, nscd-os, nscd-specs]: Remove.
[script]: Filter out from SPECS bind-mounts where the device does not
exist.
* guix/scripts/environment.scm (launch-environment/container)
[optional-mapping->fs]: New procedure.
[mappings]: Remove %NETWORK-FILE-MAPPINGS.
[file-systems]: Add %NETWORK-FILE-MAPPINGS here, filtered through
'optional-mapping->fs'.
Diffstat (limited to 'gnu/build')
| -rw-r--r-- | gnu/build/shepherd.scm | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gnu/build/shepherd.scm b/gnu/build/shepherd.scm index cf68f2108b..b32765ed5e 100644 --- a/gnu/build/shepherd.scm +++ b/gnu/build/shepherd.scm @@ -67,16 +67,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 - %network-file-mappings)) + %network-file-mappings) ,@(if (and (memq 'mnt namespaces) (not (memq 'user namespaces))) accounts |