diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-01-09 20:52:08 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-01-09 20:52:08 +0300 |
| commit | c03fe792656b506b40e18d9c070d0bad8f7f1c3e (patch) | |
| tree | fa3b8e6d5bf875f30a5629f72d76a87e0d67944a /nixos/modules/installer/cd-dvd | |
| parent | 84631f32276a86a1748effc7399c8c0ea97500ba (diff) | |
| parent | 119c8f91e7f17d2cb95f42985816820600c389cf (diff) | |
| download | nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.gz nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.bz2 nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.lz nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.xz nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.tar.zst nixlib-c03fe792656b506b40e18d9c070d0bad8f7f1c3e.zip | |
Merge pull request #10996 from oxij/nixos-label
nixos: introduce system.nixosLabel support
Diffstat (limited to 'nixos/modules/installer/cd-dvd')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-base.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index bc3bd872d2a5..2569860a098f 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -16,7 +16,7 @@ with lib; ]; # ISO naming. - isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso"; + isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosLabel}-${pkgs.stdenv.system}.iso"; isoImage.volumeID = substring 0 11 "NIXOS_ISO"; diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index d3353ee7d64d..248b0f00283c 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -39,7 +39,7 @@ let DEFAULT boot LABEL boot - MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} + MENU LABEL NixOS ${config.system.nixosLabel}${config.isoImage.appendToMenuLabel} LINUX /boot/bzImage APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} INITRD /boot/initrd |