diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-06-08 14:51:33 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-06-08 15:23:39 +0200 |
| commit | 50e53c1c678810ef2b6efc47221ffe2d1a3c6cf0 (patch) | |
| tree | 0364099fa5de6360dfb97444592d3419a60a907f /gnu/system | |
| parent | 849a1399ca46497ad6acc5b11903f345502c02de (diff) | |
| download | gnu-guix-50e53c1c678810ef2b6efc47221ffe2d1a3c6cf0.tar gnu-guix-50e53c1c678810ef2b6efc47221ffe2d1a3c6cf0.tar.gz | |
vm: 'expression->derivation-in-linux-vm' takes a #:file-systems parameter.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Add
#:file-systems and use it instead of %LINUX-VM-FILE-SYSTEMS.
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/vm.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 8cfbda2264..4a159d6159 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -125,6 +125,8 @@ (env-vars '()) (guile-for-build (%guile-for-build)) + (file-systems + %linux-vm-file-systems) (single-file-output? #f) (make-disk-image? #f) @@ -134,8 +136,9 @@ (disk-image-size 'guess)) "Evaluate EXP in a QEMU virtual machine running LINUX with INITRD (a derivation). The virtual machine runs with MEMORY-SIZE MiB of memory. In the -virtual machine, EXP has access to all its inputs from the store; it should -put its output file(s) in the '/xchg' directory. +virtual machine, EXP has access to FILE-SYSTEMS, which, by default, includes a +9p share of the store, the '/xchg' where EXP should put its output file(s), +and a 9p share of /tmp. If SINGLE-FILE-OUTPUT? is true, copy a single file from '/xchg' to OUTPUT. Otherwise, copy the contents of /xchg to a new directory OUTPUT. @@ -155,7 +158,7 @@ made available under the /xchg CIFS share." (coreutils -> (canonical-package coreutils)) (initrd (if initrd ; use the default initrd? (return initrd) - (base-initrd %linux-vm-file-systems + (base-initrd file-systems #:on-error 'backtrace #:linux linux #:linux-modules %base-initrd-modules |