diff options
| -rw-r--r-- | modules/installer/cd-dvd/installation-cd-base.nix | 2 | ||||
| -rw-r--r-- | modules/installer/cd-dvd/iso-image.nix | 9 | ||||
| -rw-r--r-- | release.nix | 11 |
3 files changed, 16 insertions, 6 deletions
diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix index e3a458cb92c..a011861ea36 100644 --- a/modules/installer/cd-dvd/installation-cd-base.nix +++ b/modules/installer/cd-dvd/installation-cd-base.nix @@ -39,7 +39,7 @@ in ]; # ISO naming. - isoImage.isoName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso"; + isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso"; isoImage.volumeID = "NIXOS_INSTALL_CD_${config.system.nixosVersion}"; diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix index ee7ce632e51..6e1994cffc7 100644 --- a/modules/installer/cd-dvd/iso-image.nix +++ b/modules/installer/cd-dvd/iso-image.nix @@ -11,12 +11,19 @@ let options = { isoImage.isoName = mkOption { - default = "cd.iso"; + default = "${config.isoImage.isoName}.iso"; description = '' Name of the generated ISO image file. ''; }; + isoImage.isoBaseName = mkOption { + default = "nixos"; + description = '' + Prefix of the name of the generated ISO image file. + ''; + }; + isoImage.compressImage = mkOption { default = false; description = '' diff --git a/release.nix b/release.nix index ca178f1290b..f89709c628d 100644 --- a/release.nix +++ b/release.nix @@ -4,7 +4,7 @@ let makeIso = - { module, description, maintainers ? ["eelco"]}: + { module, type, description ? type, maintainers ? ["eelco"] }: { nixosSrc ? {outPath = ./.; rev = 1234;} , officialRelease ? false , system ? "i686-linux" @@ -16,7 +16,10 @@ let version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}"); - versionModule = { system.nixosVersion = version; }; + versionModule = + { system.nixosVersion = version; + isoImage.isoBaseName = "nixos-${type}"; + }; config = (import lib/eval-config.nix { inherit system nixpkgs; @@ -119,12 +122,12 @@ let iso_minimal = makeIso { module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; - description = "minimal"; + type = "minimal"; }; iso_graphical = makeIso { module = ./modules/installer/cd-dvd/installation-cd-graphical.nix; - description = "graphical"; + type = "graphical"; }; # Provide a tarball that can be unpacked into an SD card, and easily |