public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Azure: switch back to qemu 2.2.0 for generating image. Seems to work best. 

(cherry picked from commit 2da8a5dac8674501ba9ed10e44650088b466688a)
This commit is contained in:
Rob Vermaas 2017-02-13 09:54:18 +00:00
parent eff0752dbc
commit af3732b6c6
No known key found for this signature in database
GPG Key ID: E114A5F264A8AE8E
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/virtualisation/azure-image.nix
View File

@ -16,14 +16,14 @@ in
cyl=$(((${diskSize}*1024*1024)/(512*63*255))) cyl=$(((${diskSize}*1024*1024)/(512*63*255)))
size=$(($cyl*255*63*512)) size=$(($cyl*255*63*512))
roundedsize=$((($size/(1024*1024)+1)*(1024*1024))) 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/ mv closure xchg/
''; '';
postVM = postVM =
'' ''
mkdir -p $out 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 rm $diskImage
''; '';
diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";