vm: 'qemu-image' uses the native partitioning tools and bootloader.
authorLudovic Courtès <ludo@gnu.org>
Wed, 27 May 2020 21:08:15 +0000 (23:08 +0200)
committerLudovic Courtès <ludo@gnu.org>
Sat, 6 Jun 2020 21:28:49 +0000 (23:28 +0200)
* gnu/system/vm.scm (qemu-image): Use #+ for Parted, the bootloader, etc.

gnu/system/vm.scm

index d737a5e..c7767db 100644 (file)
@@ -345,7 +345,7 @@ system that is passed to 'populate-root-file-system'."
            (setlocale LC_ALL "en_US.utf8")
 
            (let ((inputs
-                  '#$(append (list parted e2fsprogs dosfstools)
+                  '#+(append (list parted e2fsprogs dosfstools)
                              (map canonical-package
                                   (list sed grep coreutils findutils gawk))))
 
@@ -422,12 +422,12 @@ system that is passed to 'populate-root-file-system'."
                                      #:partitions partitions
                                      #:grub-efi grub-efi
                                      #:bootloader-package
-                                     #$(bootloader-package bootloader)
+                                     #+(bootloader-package bootloader)
                                      #:bootcfg #$bootcfg-drv
                                      #:bootcfg-location
                                      #$(bootloader-configuration-file bootloader)
                                      #:bootloader-installer
-                                     #$(bootloader-installer bootloader)))))))
+                                     #+(bootloader-installer bootloader)))))))
    #:system system
    #:make-disk-image? #t
    #:disk-image-size disk-image-size