05/07: vm: 'system-disk-image' honors #:substitutable? for ISO9660 images.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 76026b5f519826291b3878eee9fb9580d2db5238
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri Apr 10 15:43:03 2020 +0200

    vm: 'system-disk-image' honors #:substitutable? for ISO9660 images.
    
    This is a followup to a328f66a9e16d7bae765d8bc088e4a97037e6e2b.
    
    * gnu/system/vm.scm (iso9660-image): Add #:substitutable? and pass it to
    'expression->derivation-in-linux-vm'.
    (system-disk-image): Pass #:substitutable? to 'iso9660-image'.
---
 gnu/system/vm.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 60a4158..00c6f0f 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -283,7 +283,8 @@ substitutable."
                         bootloader
                         (register-closures? (has-guix-service-type? os))
                         (inputs '())
-                        (grub-mkrescue-environment '()))
+                        (grub-mkrescue-environment '())
+                        (substitutable? #t))
   "Return a bootable, stand-alone iso9660 image.
 
 INPUTS is a list of inputs (as for packages)."
@@ -354,6 +355,7 @@ INPUTS is a list of inputs (as for packages)."
    #:make-disk-image? #f
    #:single-file-output? #t
    #:references-graphs inputs
+   #:substitutable? substitutable?
 
    ;; Xorriso seems to be quite memory-hungry, so increase the VM's RAM size.
    #:memory-size 512))
@@ -735,7 +737,8 @@ substitutable."
                        #:inputs `(("system" ,os)
                                   ("bootcfg" ,bootcfg))
                        #:grub-mkrescue-environment
-                       '(("MKRESCUE_SED_MODE" . "mbr_hfs")))
+                       '(("MKRESCUE_SED_MODE" . "mbr_hfs"))
+                       #:substitutable? substitutable?)
         (qemu-image #:name name
                     #:os os
                     #:bootcfg-drv bootcfg