From 8cbc6d6da6d94c53ea87c2aeb14a4f7b7c43258b Mon Sep 17 00:00:00 2001 From: phaer Date: Thu, 22 May 2025 00:45:11 +0200 Subject: [PATCH 1/4] amazon-image: fix image.extension value for vpc/vhd files vpc files use the extension "vhd". `make-disk-image-nix` contains a lookup table, but does not expose that. vpc is the only format supported by the amazon image which is affected. Format and extension are the same for raw and qcow2. --- nixos/maintainers/scripts/ec2/amazon-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index a192b91196de..e0bb2b6d50ef 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -88,7 +88,7 @@ in config.system.nixos.tags = [ "amazon" ]; config.system.build.image = config.system.build.amazonImage; - config.image.extension = cfg.format; + config.image.extension = if cfg.format == "vpc" then "vhd" else cfg.format; config.system.build.amazonImage = let From 037a064feb3a53f2a81094fc701e6cb59fc063a7 Mon Sep 17 00:00:00 2001 From: phaer Date: Fri, 23 May 2025 12:22:46 +0200 Subject: [PATCH 2/4] sd-image: Fix image.filePath directory prefix --- nixos/modules/installer/sd-card/sd-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix index d9eec037c99d..cba5f3e8e882 100644 --- a/nixos/modules/installer/sd-card/sd-image.nix +++ b/nixos/modules/installer/sd-card/sd-image.nix @@ -205,7 +205,7 @@ in sdImage.storePaths = [ config.system.build.toplevel ]; image.extension = if config.sdImage.compressImage then "img.zst" else "img"; - image.filePath = "sd-card/${config.image.fileName}"; + image.filePath = "sd-image/${config.image.fileName}"; system.nixos.tags = [ "sd-card" ]; system.build.image = config.system.build.sdImage; system.build.sdImage = pkgs.callPackage ( From 5aba7c7131db6cff6c4dd4f7e0bf3a0d5fc08b6d Mon Sep 17 00:00:00 2001 From: phaer Date: Fri, 23 May 2025 12:24:32 +0200 Subject: [PATCH 3/4] openstack-image-zfs: drop ".root" suffix in generated image name hydra-build-products is automatically updated with the right name, as is image-info.json. This breaks hardcoded uses of the filename, but ensures that all the other outputs are consistent and image.filePath is correct --- nixos/maintainers/scripts/openstack/openstack-image-zfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix index 869d5a3c1fc3..2e7cd481584a 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix @@ -113,7 +113,7 @@ in postVM = '' extension=''${rootDiskImage##*.} friendlyName=$out/${config.image.baseName} - rootDisk="$friendlyName.root.$extension" + rootDisk="$friendlyName.$extension" mv "$rootDiskImage" "$rootDisk" mkdir -p $out/nix-support From b033e0c4b67084a9e3dae66b9de2e8b7d28edddd Mon Sep 17 00:00:00 2001 From: phaer Date: Fri, 23 May 2025 12:28:53 +0200 Subject: [PATCH 4/4] virtualisation/disk-image: fix image.extension --- nixos/modules/virtualisation/disk-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/disk-image.nix b/nixos/modules/virtualisation/disk-image.nix index c524b6627113..40eea6b1237b 100644 --- a/nixos/modules/virtualisation/disk-image.nix +++ b/nixos/modules/virtualisation/disk-image.nix @@ -50,7 +50,7 @@ in }; system.nixos.tags = [ cfg.format ] ++ lib.optionals cfg.efiSupport [ "efi" ]; - image.extension = cfg.format; + image.extension = if cfg.format == "raw" then "img" else cfg.format; system.build.image = import ../../lib/make-disk-image.nix { inherit lib config pkgs; inherit (config.virtualisation) diskSize;