image/images: Adapt remaining images to system.build.image & normalized filenames,

nixos/maintainers/scripts/ec2/amazon-image.nix

@@ -20,6 +20,7 @@ in
   imports = [
     ../../../modules/virtualisation/amazon-image.nix
     ../../../modules/virtualisation/disk-size-option.nix
+    ../../../modules/image/file-options.nix
     (lib.mkRenamedOptionModuleWith {
       sinceRelease = 2411;
       from = [
@@ -31,6 +32,17 @@ in
         "diskSize"
       ];
     })
+    (lib.mkRenamedOptionModuleWith {
+      sinceRelease = 2505;
+      from = [
+        "amazonImage"
+        "name"
+      ];
+      to = [
+        "image"
+        "baseName"
+      ];
+    })
   ];
 
   # Amazon recommends setting this to the highest possible value for a good EBS
@@ -44,12 +56,6 @@ in
     [ "nvme_core.io_timeout=${timeout}" ];
 
   options.amazonImage = {
-    name = mkOption {
-      type = types.str;
-      description = "The name of the generated derivation";
-      default = "nixos-amazon-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
-    };
-
     contents = mkOption {
       example = literalExpression ''
         [ { source = pkgs.memtest86 + "/memtest.bin";
@@ -80,6 +86,10 @@ in
   config.virtualisation.diskSize = lib.mkOverride 1490 (3 * 1024);
   config.virtualisation.diskSizeAutoSupported = !config.ec2.zfs.enable;
 
+  config.system.nixos.tags = [ "amazon" ];
+  config.system.build.image = config.system.build.amazonImage;
+  config.image.extension = cfg.format;
+
   config.system.build.amazonImage =
     let
       configFile = pkgs.writeText "configuration.nix" ''
@@ -102,7 +112,8 @@ in
           configFile
           pkgs
           ;
-        inherit (cfg) contents format name;
+        inherit (cfg) contents format;
+        name = config.image.baseName;
 
         includeChannel = true;
 
@@ -118,7 +129,7 @@ in
 
         postVM = ''
            extension=''${rootDiskImage##*.}
-           friendlyName=$out/${cfg.name}
+           friendlyName=$out/${config.image.baseName}
            rootDisk="$friendlyName.root.$extension"
            bootDisk="$friendlyName.boot.$extension"
            mv "$rootDiskImage" "$rootDisk"
@@ -156,19 +167,16 @@ in
           pkgs
           ;
 
-        inherit (cfg) contents format name;
+        inherit (cfg) contents format;
+        inherit (config.image) baseName;
+        name = config.image.baseName;
 
         fsType = "ext4";
         partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt";
 
         inherit (config.virtualisation) diskSize;
 
         postVM = ''
-           extension=''${diskImage##*.}
-           friendlyName=$out/${cfg.name}.$extension
-           mv "$diskImage" "$friendlyName"
-           diskImage=$friendlyName
-
            mkdir -p $out/nix-support
            echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products
 

nixos/maintainers/scripts/openstack/openstack-image-zfs.nix

@@ -16,6 +16,7 @@ in
   imports = [
     ../../../modules/virtualisation/openstack-config.nix
     ../../../modules/virtualisation/disk-size-option.nix
+    ../../../modules/image/file-options.nix
     (lib.mkRenamedOptionModuleWith {
       sinceRelease = 2411;
       from = [
@@ -27,15 +28,21 @@ in
         "diskSize"
       ];
     })
+    (lib.mkRenamedOptionModuleWith {
+      sinceRelease = 2505;
+      from = [
+        "openstackImage"
+        "name"
+      ];
+      to = [
+        "image"
+        "baseName"
+      ];
+    })
+
   ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix);
 
   options.openstackImage = {
-    name = mkOption {
-      type = types.str;
-      description = "The name of the generated derivation";
-      default = "nixos-openstack-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
-    };
-
     ramMB = mkOption {
       type = types.int;
       default = (3 * 1024);
@@ -72,9 +79,16 @@ in
     virtualisation.diskSize = lib.mkOverride 1490 (8 * 1024);
     virtualisation.diskSizeAutoSupported = false;
 
+    image.extension = cfg.format;
+    system.nixos.tags = [
+      "openstack"
+      "zfs"
+    ];
+    system.build.image = config.system.build.openstackImage;
     system.build.openstackImage = import ../../../lib/make-single-disk-zfs-image.nix {
       inherit lib config;
-      inherit (cfg) contents format name;
+      inherit (cfg) contents format;
+      name = config.image.baseName;
       pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
 
       configFile = pkgs.writeText "configuration.nix" ''
@@ -98,7 +112,7 @@ in
 
       postVM = ''
          extension=''${rootDiskImage##*.}
-         friendlyName=$out/${cfg.name}
+         friendlyName=$out/${config.image.baseName}
          rootDisk="$friendlyName.root.$extension"
          mv "$rootDiskImage" "$rootDisk"
 

nixos/maintainers/scripts/openstack/openstack-image.nix

@@ -3,19 +3,24 @@
 { config, lib, pkgs, ... }:
 let
   copyChannel = true;
+    format = "qcow2";
 in
 {
   imports = [
     ../../../modules/virtualisation/openstack-config.nix
+    ../../../modules/image/file-options.nix
   ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix);
 
   documentation.enable = copyChannel;
 
+  image.extension = format;
+  system.nixos.tags = [ "openstack" ];
+  system.build.image = config.system.build.openstackImage;
   system.build.openstackImage = import ../../../lib/make-disk-image.nix {
-    inherit lib config copyChannel;
+    inherit lib config copyChannel format;
+    inherit (config.image) baseName;
     additionalSpace = "1024M";
     pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
-    format = "qcow2";
     configFile = pkgs.writeText "configuration.nix"
       ''
         {

nixos/modules/image/images.nix

@@ -9,6 +9,7 @@ let
   inherit (lib) types;
 
   imageModules = {
+    amazon = [ ../../maintainers/scripts/ec2/amazon-image.nix ];
     azure = [ ../virtualisation/azure-image.nix ];
     digital-ocean = [ ../virtualisation/digital-ocean-image.nix ];
     google-compute = [ ../virtualisation/google-compute-image.nix ];
@@ -17,11 +18,45 @@ let
     lxc = [ ../virtualisation/lxc-container.nix ];
     lxc-metadata = [ ../virtualisation/lxc-image-metadata.nix ];
     oci = [ ../virtualisation/oci-image.nix ];
+    openstack = [ ../../maintainers/scripts/openstack/openstack-image.nix ];
+    openstack-zfs = [ ../../maintainers/scripts/openstack/openstack-image-zfs.nix ];
     proxmox = [ ../virtualisation/proxmox-image.nix ];
+    proxmox-lxc = [ ../virtualisation/proxmox-lxc.nix ];
+    qemu-efi = [ ../virtualisation/disk-image.nix ];
+    qemu = [
+      ../virtualisation/disk-image.nix
+      {
+        image.efiSupport = false;
+      }
+    ];
+    raw-efi = [
+      ../virtualisation/disk-image.nix
+      {
+        image.format = "raw";
+      }
+    ];
+    raw = [
+      ../virtualisation/disk-image.nix
+      {
+        image.format = "raw";
+        image.efiSupport = false;
+      }
+    ];
     kubevirt = [ ../virtualisation/kubevirt.nix ];
     vagrant-virtualbox = [ ../virtualisation/vagrant-virtualbox-image.nix ];
     virtualbox = [ ../virtualisation/virtualbox-image.nix ];
     vmware = [ ../virtualisation/vmware-image.nix ];
+    iso = [ ../installer/cd-dvd/iso-image.nix ];
+    iso-installer = [ ../installer/cd-dvd/installation-cd-base.nix ];
+    sd-card = [
+      (
+        let
+          module = ../. + "/installer/sd-card/sd-image-${pkgs.targetPlatform.linuxArch}.nix";
+        in
+        if builtins.pathExists module then module else throw "The module ${module} does not exist."
+      )
+    ];
+    kexec = [ ../installer/netboot/netboot-minimal.nix ];
   };
   imageConfigs = lib.mapAttrs (
     name: modules:

nixos/modules/installer/cd-dvd/installation-cd-base.nix

@@ -14,9 +14,6 @@
   # Adds terminus_font for people with HiDPI displays
   console.packages = options.console.packages.default ++ [ pkgs.terminus_font ];
 
-  # ISO naming.
-  isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso";
-
   # EFI booting
   isoImage.makeEfiBootable = true;
 

nixos/modules/installer/cd-dvd/iso-image.nix

@@ -476,23 +476,33 @@ let
 in
 
 {
-  options = {
-
-    isoImage.isoName = lib.mkOption {
-      default = "${config.isoImage.isoBaseName}.iso";
-      type = lib.types.str;
-      description = ''
-        Name of the generated ISO image file.
-      '';
-    };
+  imports = [
+    (lib.mkRenamedOptionModuleWith {
+      sinceRelease = 2505;
+      from = [
+        "isoImage"
+        "isoBaseName"
+      ];
+      to = [
+        "image"
+        "baseName"
+      ];
+    })
+    (lib.mkRenamedOptionModuleWith {
+      sinceRelease = 2505;
+      from = [
+        "isoImage"
+        "isoName"
+      ];
+      to = [
+        "image"
+        "fileName"
+      ];
+    })
+    ../../image/file-options.nix
+  ];
 
-    isoImage.isoBaseName = lib.mkOption {
-      default = config.system.nixos.distroId;
-      type = lib.types.str;
-      description = ''
-        Prefix of the name of the generated ISO image file.
-      '';
-    };
+  options = {
 
     isoImage.compressImage = lib.mkOption {
       default = false;
@@ -858,8 +868,12 @@ in
     boot.loader.timeout = 10;
 
     # Create the ISO image.
+    image.extension = if config.isoImage.compressImage then "iso.zst" else "iso";
+    image.filePath = "iso/${config.image.fileName}";
+    system.build.image = config.system.build.isoImage;
     system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({
-      inherit (config.isoImage) isoName compressImage volumeID contents;
+      inherit (config.isoImage) compressImage volumeID contents;
+      isoName = "${config.image.baseName}.iso";
       bootable = config.isoImage.makeBiosBootable;
       bootImage = "/isolinux/isolinux.bin";
       syslinux = if config.isoImage.makeBiosBootable then pkgs.syslinux else null;

nixos/modules/installer/netboot/netboot.nix

@@ -1,11 +1,15 @@
 # This module creates netboot media containing the given NixOS
 # configuration.
 
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 with lib;
 
 {
+  imports = [
+    ../../image/file-options.nix
+  ];
+
   options = {
 
     netboot.squashfsCompression = mkOption {
@@ -129,6 +133,21 @@ with lib;
       }
     ];
 
+    image.extension = "tar.xz";
+    image.filePath = "tarball/${config.image.fileName}";
+    system.nixos.tags = [ "kexec" ];
+    system.build.image = config.system.build.kexecTarball;
+    system.build.kexecTarball = pkgs.callPackage "${toString modulesPath}/../lib/make-system-tarball.nix" {
+      fileName = config.image.baseName;
+      storeContents = [
+        {
+          object = config.system.build.kexecScript;
+          symlink = "/kexec_nixos";
+        }
+      ];
+      contents = [];
+    };
+
     boot.loader.timeout = 10;
 
     boot.postBootCommands =