summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-02-06 15:42:00 +0100
committerLudovic Courtès <ludo@gnu.org>2017-02-07 00:08:10 +0100
commit7597478e2e731c09890b25ff0b817d2d7c45d01f (patch)
treea18d8348cbf417a05dc94a5f2240fea80979687f /guix
parenta24fda8114eb49595adb6f08bdb44da0a135e0cd (diff)
downloadgnu-guix-7597478e2e731c09890b25ff0b817d2d7c45d01f.tar
gnu-guix-7597478e2e731c09890b25ff0b817d2d7c45d01f.tar.gz
file-systems: Add '%network-configuration-files' and '%network-file-mappings'.
* gnu/system/file-systems.scm (%network-configuration-files) (%network-file-mappings): New variables. * guix/scripts/environment.scm (%network-configuration-files): Remove. (launch-environment/container): Refer to '%network-file-mappings' instead of calling 'filter-map'.
Diffstat (limited to 'guix')
-rw-r--r--guix/scripts/environment.scm23
1 files changed, 1 insertions, 22 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 0a1205d087..44f490043c 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -60,12 +60,6 @@ directories in PROFILE, the store path of a profile."
(define %default-shell
(or (getenv "SHELL") "/bin/sh"))
-(define %network-configuration-files
- '("/etc/resolv.conf"
- "/etc/nsswitch.conf"
- "/etc/services"
- "/etc/hosts"))
-
(define (purify-environment)
"Unset almost all environment variables. A small number of variables such
as 'HOME' and 'USER' are left untouched."
@@ -408,22 +402,7 @@ host file systems to mount inside the container."
;; When in Rome, do as Nix build.cc does: Automagically
;; map common network configuration files.
(if network?
- (filter-map (lambda (file)
- (and (file-exists? file)
- (file-system-mapping
- (source file)
- (target file)
- ;; XXX: On some GNU/Linux
- ;; systems, /etc/resolv.conf is a
- ;; symlink to a file in a tmpfs
- ;; which, for an unknown reason,
- ;; cannot be bind mounted
- ;; read-only within the
- ;; container.
- (writable?
- (string=? file
- "/etc/resolv.conf")))))
- %network-configuration-files)
+ %network-file-mappings
'())
;; Mappings for the union closure of all inputs.
(map (lambda (dir)