From 5aba7c7131db6cff6c4dd4f7e0bf3a0d5fc08b6d Mon Sep 17 00:00:00 2001 From: phaer Date: Fri, 23 May 2025 12:24:32 +0200 Subject: [PATCH] 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