summary refs log tree commit diff
path: root/pkgs/build-support/vm
diff options
context:
space:
mode:
authorChristian Kögler <ck3d@gmx.de>2021-10-28 00:05:27 +0200
committerChristian Kögler <ck3d@gmx.de>2021-10-28 00:05:27 +0200
commit9bf244964dcee435d2464e0054c558822e3184ab (patch)
treeaca63e3fa25bba2fe81af929d1e50a4899ed0c7a /pkgs/build-support/vm
parent062512179362d5c082c4121cf3f476bdebf8442b (diff)
runInLinuxImage: Add missing backing format
Diffstat (limited to 'pkgs/build-support/vm')
-rw-r--r--pkgs/build-support/vm/default.nix2
-rw-r--r--pkgs/build-support/vm/test.nix1
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index d2aeb784e7fdc..a6633d11286f0 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -390,7 +390,7 @@ rec {
       diskImage=$(pwd)/disk-image.qcow2
       origImage=${attrs.diskImage}
       if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi
-      ${qemu}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage
+      ${qemu}/bin/qemu-img create -F ${attrs.diskImageFormat} -b "$origImage" -f qcow2 $diskImage
     '';
 
     /* Inside the VM, run the stdenv setup script normally, but at the
diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index 9074977c0eddb..384c920880839 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -29,6 +29,7 @@ with vmTools;
     name = "deb-compile";
     src = patchelf.src;
     diskImage = diskImages.ubuntu1804i386;
+    diskImageFormat = "qcow2";
     memSize = 512;
     postHook = ''
       dpkg-query --list