diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-02-23 22:47:44 +0000 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-02-23 22:47:44 +0000 |
| commit | cfa99e5a992b03c8dd513d40c343fa3d034c27a2 (patch) | |
| tree | 02db1d1b3dc184b3b1a3541bfb946e67f2dd4853 /nixos | |
| parent | 55ca9eb477d668ea3a9e08546093e0ae7365ebf6 (diff) | |
| parent | 718848d5aac47660b0c0d7bdd1702c1f474debf1 (diff) | |
| download | nixpkgs-cfa99e5a992b03c8dd513d40c343fa3d034c27a2.tar nixpkgs-cfa99e5a992b03c8dd513d40c343fa3d034c27a2.tar.gz nixpkgs-cfa99e5a992b03c8dd513d40c343fa3d034c27a2.tar.bz2 nixpkgs-cfa99e5a992b03c8dd513d40c343fa3d034c27a2.tar.lz nixpkgs-cfa99e5a992b03c8dd513d40c343fa3d034c27a2.tar.xz nixpkgs-cfa99e5a992b03c8dd513d40c343fa3d034c27a2.tar.zst nixpkgs-cfa99e5a992b03c8dd513d40c343fa3d034c27a2.zip | |
Merge pull request #13114 from colemickens/azure
azure: package qemu 2.2.0 to fix VHD creation
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/azure-image.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 7093e50ed35..f0a739bc95d 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.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc -o subformat=fixed $diskImage $out/disk.vhd + ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -O vpc -o subformat=fixed $diskImage $out/disk.vhd rm $diskImage ''; diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; diff --git a/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch b/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch new file mode 100644 index 00000000000..81d29feea3d --- /dev/null +++ b/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index d6b9dc1..ce7c493 100644 +--- a/Makefile ++++ b/Makefile +@@ -384,8 +384,7 @@ install-confdir: + install-sysconfig: install-datadir install-confdir + $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" + +-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ +-install-datadir install-localstatedir ++install: all $(if $(BUILD_DOCS),install-doc) install-datadir + ifneq ($(TOOLS),) + $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) + endif |