Merge pull request #143237 from ck3d/fix-runInLinuxImage

vmTools: Fix missing backing format in runInLinuxImage

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

pkgs/build-support/vm/test.nix

@@ -28,10 +28,10 @@ with vmTools;
   buildInDebian = runInLinuxImage (stdenv.mkDerivation {
     name = "deb-compile";
     src = patchelf.src;
-    diskImage = diskImages.ubuntu1204i386;
+    diskImage = diskImages.ubuntu1804i386;
+    diskImageFormat = "qcow2";
     memSize = 512;
-    prePhases = [ sysInfoPhase ];
-    sysInfoPhase = ''
+    postHook = ''
       dpkg-query --list
     '';
   });