nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scripts: environment: Only rewrite user-specified mappings. 

* guix/scripts/environment.scm (launch-environment/container): Only
  apply override-user-mappings to user-mappings and cwd. Do not apply to
  network configuration mapping and inputs.
master
Carl Dong 2019-06-29 16:59:22 -04:00 committed by Carl Dong
parent 0971f8bd88
commit a655d504aa
No known key found for this signature in database
GPG Key ID: 0CC52153197991A5
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guix/scripts/environment.scm
View File

@ -479,6 +479,7 @@ will be used for the passwd entry. LINK-PROFILE? creates a symbolic link from
;; /bin/sh, the current working directory, and possibly networking ;; /bin/sh, the current working directory, and possibly networking
;; configuration files within the container. ;; configuration files within the container.
(mappings (mappings
(append
(override-user-mappings (override-user-mappings
user home user home
(append user-mappings (append user-mappings
@ -486,7 +487,7 @@ will be used for the passwd entry. LINK-PROFILE? creates a symbolic link from
(list (file-system-mapping (list (file-system-mapping
(source cwd) (source cwd)
(target cwd) (target cwd)
(writable? #t))) (writable? #t)))))
;; When in Rome, do as Nix build.cc does: Automagically ;; When in Rome, do as Nix build.cc does: Automagically
;; map common network configuration files. ;; map common network configuration files.
(if network? (if network?
@ -498,7 +499,7 @@ will be used for the passwd entry. LINK-PROFILE? creates a symbolic link from
(source dir) (source dir)
(target dir) (target dir)
(writable? #f))) (writable? #f)))
reqs)))) reqs)))
(file-systems (append %container-file-systems (file-systems (append %container-file-systems
(map file-system-mapping->bind-mount (map file-system-mapping->bind-mount
mappings)))) mappings))))