diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2017-02-13 09:54:18 +0000 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2017-02-13 09:55:03 +0000 |
| commit | af3732b6c6adb11f45cc9d72c3ddf33fd51c47e0 (patch) | |
| tree | 110eb287a4413519b2658d348c6db1dc8c3a7796 /nixos/modules/virtualisation/azure-image.nix | |
| parent | eff0752dbc36f52fce9c27ff10b8db41a5f632f4 (diff) | |
| download | nixpkgs-af3732b6c6adb11f45cc9d72c3ddf33fd51c47e0.tar nixpkgs-af3732b6c6adb11f45cc9d72c3ddf33fd51c47e0.tar.gz nixpkgs-af3732b6c6adb11f45cc9d72c3ddf33fd51c47e0.tar.bz2 nixpkgs-af3732b6c6adb11f45cc9d72c3ddf33fd51c47e0.tar.lz nixpkgs-af3732b6c6adb11f45cc9d72c3ddf33fd51c47e0.tar.xz nixpkgs-af3732b6c6adb11f45cc9d72c3ddf33fd51c47e0.tar.zst nixpkgs-af3732b6c6adb11f45cc9d72c3ddf33fd51c47e0.zip | |
Azure: switch back to qemu 2.2.0 for generating image. Seems to work best.
(cherry picked from commit 2da8a5dac8674501ba9ed10e44650088b466688a)
Diffstat (limited to 'nixos/modules/virtualisation/azure-image.nix')
| -rw-r--r-- | nixos/modules/virtualisation/azure-image.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 91fae88fc98..33f84986cac 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -16,14 +16,14 @@ in cyl=$(((${diskSize}*1024*1024)/(512*63*255))) size=$(($cyl*255*63*512)) roundedsize=$((($size/(1024*1024)+1)*(1024*1024))) - ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage $roundedsize + ${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize mv closure xchg/ ''; postVM = '' mkdir -p $out - ${pkgs.qemu}/bin/qemu-img convert -f raw -o force_size -O vpc $diskImage $out/disk.vhd + ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd rm $diskImage ''; diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; |