ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

vm: 'expression->derivation-in-linux-vm' takes a #:file-systems parameter.

Browse source 
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Add
 #:file-systems and use it instead of %LINUX-VM-FILE-SYSTEMS.
This commit is contained in:
Ludovic Courtès 2018-06-08 14:51:33 +02:00
parent 849a1399ca
commit 50e53c1c67
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/system/vm.scm
View file

@ -125,6 +125,8 @@ (define* (expression->derivation-in-linux-vm name exp
(env-vars '()) (env-vars '())
(guile-for-build (guile-for-build
(%guile-for-build)) (%guile-for-build))
(file-systems
%linux-vm-file-systems)
(single-file-output? #f) (single-file-output? #f)
(make-disk-image? #f) (make-disk-image? #f)
@ -134,8 +136,9 @@ (define* (expression->derivation-in-linux-vm name exp
(disk-image-size 'guess)) (disk-image-size 'guess))
"Evaluate EXP in a QEMU virtual machine running LINUX with INITRD (a "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 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 virtual machine, EXP has access to FILE-SYSTEMS, which, by default, includes a
put its output file(s) in the '/xchg' directory. 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. 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. Otherwise, copy the contents of /xchg to a new directory OUTPUT.
@ -155,7 +158,7 @@ (define* (expression->derivation-in-linux-vm name exp
(coreutils -> (canonical-package coreutils)) (coreutils -> (canonical-package coreutils))
(initrd (if initrd ; use the default initrd? (initrd (if initrd ; use the default initrd?
(return initrd) (return initrd)
(base-initrd %linux-vm-file-systems (base-initrd file-systems
#:on-error 'backtrace #:on-error 'backtrace
#:linux linux #:linux linux
#:linux-modules %base-initrd-modules #:linux-modules %base-initrd-modules