From f3563c996e070676a180a0c7f2d35e96fbc472c4 Mon Sep 17 00:00:00 2001 From: phaer Date: Fri, 15 Nov 2024 00:35:48 +0100 Subject: [PATCH] virtualisation/azure-image: use system.build.image --- nixos/modules/virtualisation/azure-image.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 76d8a3bb365b..53021e635b07 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -13,6 +13,7 @@ in imports = [ ./azure-common.nix ./disk-size-option.nix + ../image/file-options.nix (lib.mkRenamedOptionModuleWith { sinceRelease = 2411; from = [ @@ -61,10 +62,14 @@ in }; config = { + image.extension = "vhd"; + system.nixos.tags = [ "azure" ]; + system.build.image = config.system.build.azureImage; system.build.azureImage = import ../../lib/make-disk-image.nix { name = "azure-image"; + inherit (config.image) baseName; postVM = '' - ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/disk.vhd + ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/${config.image.fileName} rm $diskImage ''; configFile = ./azure-config-user.nix;