01/02: scripts: environment: Only rewrite user-specified mappings.

[guix-commits]

carl pushed a commit to branch master
in repository guix.

commit a655d504aa1dc04ab9c8916f2022f07ca89ceb3b
Author: Carl Dong <address@hidden>
Date:   Sat Jun 29 16:59:22 2019 -0400

    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.
---
 guix/scripts/environment.scm | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index c134162..949ba11 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -479,26 +479,27 @@ will be used for the passwd entry.  LINK-PROFILE? creates 
a symbolic link from
             ;; /bin/sh, the current working directory, and possibly networking
             ;; configuration files within the container.
             (mappings
-             (override-user-mappings
-              user home
-              (append user-mappings
-                      ;; Current working directory.
-                      (list (file-system-mapping
-                             (source cwd)
-                             (target cwd)
-                             (writable? #t)))
-                      ;; When in Rome, do as Nix build.cc does: Automagically
-                      ;; map common network configuration files.
-                      (if network?
-                          %network-file-mappings
-                          '())
-                      ;; Mappings for the union closure of all inputs.
-                      (map (lambda (dir)
-                             (file-system-mapping
-                              (source dir)
-                              (target dir)
-                              (writable? #f)))
-                           reqs))))
+             (append
+              (override-user-mappings
+               user home
+               (append user-mappings
+                       ;; Current working directory.
+                       (list (file-system-mapping
+                              (source cwd)
+                              (target cwd)
+                              (writable? #t)))))
+              ;; When in Rome, do as Nix build.cc does: Automagically
+              ;; map common network configuration files.
+              (if network?
+                  %network-file-mappings
+                  '())
+              ;; Mappings for the union closure of all inputs.
+              (map (lambda (dir)
+                     (file-system-mapping
+                      (source dir)
+                      (target dir)
+                      (writable? #f)))
+                   reqs)))
             (file-systems (append %container-file-systems
                                   (map file-system-mapping->bind-mount
                                        mappings))))