mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-27 04:59:27 -05:00
scripts: environment: Fix ordering issue with CWD and --expose.
Fixes <https://issues.guix.gnu.org/46782>. * guix/scripts/environment.scm (launch-environment/container): Move the CWD mapping to the front of the file system mappings. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
parent
61a0b03c65
commit
aca64d5604
1 changed files with 11 additions and 8 deletions
|
@ -767,14 +767,17 @@ (define fhs-mappings
|
||||||
(append
|
(append
|
||||||
(override-user-mappings
|
(override-user-mappings
|
||||||
user home
|
user home
|
||||||
(append user-mappings
|
(append
|
||||||
;; Share current working directory, unless asked not to.
|
;; Share current working directory, unless asked not to.
|
||||||
(if map-cwd?
|
(if map-cwd?
|
||||||
(list (file-system-mapping
|
(list (file-system-mapping
|
||||||
(source cwd)
|
(source cwd)
|
||||||
(target cwd)
|
(target cwd)
|
||||||
(writable? #t)))
|
(writable? #t)))
|
||||||
'())))
|
'())
|
||||||
|
;; Add the user mappings *after* the current working directory
|
||||||
|
;; so that a user can layer bind mounts on top of it.
|
||||||
|
user-mappings))
|
||||||
;; Mappings for the union closure of all inputs.
|
;; Mappings for the union closure of all inputs.
|
||||||
(map (lambda (dir)
|
(map (lambda (dir)
|
||||||
(file-system-mapping
|
(file-system-mapping
|
||||||
|
|
Loading…
Reference in a new issue