diff options
| author | Cole Mickens <cole.mickens@gmail.com> | 2018-06-12 02:03:23 -0700 |
|---|---|---|
| committer | Cole Mickens <cole.mickens@gmail.com> | 2018-06-12 02:06:03 -0700 |
| commit | a44a9fdad612aff807239cd72eb765a6f6350b1b (patch) | |
| tree | 4afaebeffed6b7847e486d4a0bd83a8e0e057da0 /nixos | |
| parent | b224bc1d2b75e212531a07c5953f6c978880fc77 (diff) | |
| download | nixlib-a44a9fdad612aff807239cd72eb765a6f6350b1b.tar nixlib-a44a9fdad612aff807239cd72eb765a6f6350b1b.tar.gz nixlib-a44a9fdad612aff807239cd72eb765a6f6350b1b.tar.bz2 nixlib-a44a9fdad612aff807239cd72eb765a6f6350b1b.tar.lz nixlib-a44a9fdad612aff807239cd72eb765a6f6350b1b.tar.xz nixlib-a44a9fdad612aff807239cd72eb765a6f6350b1b.tar.zst nixlib-a44a9fdad612aff807239cd72eb765a6f6350b1b.zip | |
azure: stop carrying qemu-220 patch
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, 2 insertions, 16 deletions
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index cb756842f369..dd2108ccc379 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -2,13 +2,13 @@ with lib; let - diskSize = 30720; + diskSize = 2048; in { system.build.azureImage = import ../../lib/make-disk-image.nix { name = "azure-image"; postVM = '' - ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd + ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/disk.vhd ''; configFile = ./azure-config-user.nix; format = "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 deleted file mode 100644 index 81d29feea3de..000000000000 --- a/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 |