Permalink
Browse files

Use default qemu for azure image generation, and use option to enforc…

…e sizing of image to be compliant with Azure/HyperV.

(cherry picked from commit e16db56)
  • Loading branch information...
1 parent e63d15f commit eff0752dbc36f52fce9c27ff10b8db41a5f632f4 @rbvermaa rbvermaa committed Feb 13, 2017
Showing with 2 additions and 2 deletions.
  1. +2 −2 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-220}/bin/qemu-img create -f raw $diskImage $roundedsize
+ ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage $roundedsize
mv closure xchg/
'';
postVM =
''
mkdir -p $out
- ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd
+ ${pkgs.qemu}/bin/qemu-img convert -f raw -o force_size -O vpc $diskImage $out/disk.vhd
rm $diskImage
'';
diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";

0 comments on commit eff0752

Please sign in to comment.