diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-11-10 17:45:54 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-11-10 18:01:44 +0100 |
| commit | 5970e8e248f6327c41c83b86bb2c89be7c3b1b4e (patch) | |
| tree | 0f796474c90be43c8ce6f2e974064953e0b230c4 /guix | |
| parent | 5e7eaccb14382b2d49bc8b4fc10fc57876d6c56f (diff) | |
| download | gnu-guix-5970e8e248f6327c41c83b86bb2c89be7c3b1b4e.tar gnu-guix-5970e8e248f6327c41c83b86bb2c89be7c3b1b4e.tar.gz | |
container: Pass a list of <file-system> objects as things to mount.
* gnu/build/linux-container.scm (mount-file-systems): 'mounts' is now a
list of <file-system> objects instead of a list of lists ("specs").
Add call to 'file-system->spec' as the argument to 'mount-file-system'.
(run-container, call-with-container): Adjust docstring accordingly.
* gnu/system/file-systems.scm (spec->file-system): New procedure.
* gnu/system/linux-container.scm (container-script)[script]: Call
'spec->file-system' inside gexp.
* guix/scripts/environment.scm (launch-environment/container): Remove
call to 'file-system->spec'.
* tests/containers.scm ("call-with-container, mnt namespace")
("call-with-container, mnt namespace, wrong bind mount"): Pass a list of
<file-system> objects.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/scripts/environment.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 0c69bfc9d3..6dea67ca22 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -427,7 +427,7 @@ host file systems to mount inside the container." (file-systems (append %container-file-systems (map mapping->file-system mappings)))) (exit/status - (call-with-container (map file-system->spec file-systems) + (call-with-container file-systems (lambda () ;; Setup global shell. (mkdir-p "/bin") |