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 | |
| parent | 849a1399ca46497ad6acc5b11903f345502c02de (diff) | |
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')
| -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 8cfbda22641..4a159d61593 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm | |||
| @@ -125,6 +125,8 @@ | |||
| 125 | (env-vars '()) | 125 | (env-vars '()) |
| 126 | (guile-for-build | 126 | (guile-for-build |
| 127 | (%guile-for-build)) | 127 | (%guile-for-build)) |
| 128 | (file-systems | ||
| 129 | %linux-vm-file-systems) | ||
| 128 | 130 | ||
| 129 | (single-file-output? #f) | 131 | (single-file-output? #f) |
| 130 | (make-disk-image? #f) | 132 | (make-disk-image? #f) |
| @@ -134,8 +136,9 @@ | |||
| 134 | (disk-image-size 'guess)) | 136 | (disk-image-size 'guess)) |
| 135 | "Evaluate EXP in a QEMU virtual machine running LINUX with INITRD (a | 137 | "Evaluate EXP in a QEMU virtual machine running LINUX with INITRD (a |
| 136 | derivation). The virtual machine runs with MEMORY-SIZE MiB of memory. In the | 138 | derivation). The virtual machine runs with MEMORY-SIZE MiB of memory. In the |
| 137 | virtual machine, EXP has access to all its inputs from the store; it should | 139 | virtual machine, EXP has access to FILE-SYSTEMS, which, by default, includes a |
| 138 | put its output file(s) in the '/xchg' directory. | 140 | 9p share of the store, the '/xchg' where EXP should put its output file(s), |
| 141 | and a 9p share of /tmp. | ||
| 139 | 142 | ||
| 140 | If SINGLE-FILE-OUTPUT? is true, copy a single file from '/xchg' to OUTPUT. | 143 | If SINGLE-FILE-OUTPUT? is true, copy a single file from '/xchg' to OUTPUT. |
| 141 | Otherwise, copy the contents of /xchg to a new directory OUTPUT. | 144 | Otherwise, copy the contents of /xchg to a new directory OUTPUT. |
| @@ -155,7 +158,7 @@ made available under the /xchg CIFS share." | |||
| 155 | (coreutils -> (canonical-package coreutils)) | 158 | (coreutils -> (canonical-package coreutils)) |
| 156 | (initrd (if initrd ; use the default initrd? | 159 | (initrd (if initrd ; use the default initrd? |
| 157 | (return initrd) | 160 | (return initrd) |
| 158 | (base-initrd %linux-vm-file-systems | 161 | (base-initrd file-systems |
| 159 | #:on-error 'backtrace | 162 | #:on-error 'backtrace |
| 160 | #:linux linux | 163 | #:linux linux |
| 161 | #:linux-modules %base-initrd-modules | 164 | #:linux-modules %base-initrd-modules |
