diff options
| author | Victor Fuentes <vmfuentes64@gmail.com> | 2022-12-17 18:00:58 -0500 |
|---|---|---|
| committer | Victor Fuentes <vmfuentes64@gmail.com> | 2023-01-14 16:19:06 -0500 |
| commit | d3528cdc3dbe82a0551707fe869aec02bba72956 (patch) | |
| tree | a7d859d287043b45ccf110cb8eb79a30749d01e3 /nixos/modules/system/activation | |
| parent | c9c4aea7ab0d137c62e09300d874be8a9a6820fc (diff) | |
nixos/version: add config.system.nixos.distroName and config.system.nixos.distroId
Diffstat (limited to 'nixos/modules/system/activation')
| -rw-r--r-- | nixos/modules/system/activation/bootspec.nix | 2 | ||||
| -rwxr-xr-x | nixos/modules/system/activation/switch-to-configuration.pl | 2 | ||||
| -rw-r--r-- | nixos/modules/system/activation/top-level.nix | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/system/activation/bootspec.nix b/nixos/modules/system/activation/bootspec.nix index 61407ab67558b..1055ed1dda902 100644 --- a/nixos/modules/system/activation/bootspec.nix +++ b/nixos/modules/system/activation/bootspec.nix @@ -22,7 +22,7 @@ let system = config.boot.kernelPackages.stdenv.hostPlatform.system; kernel = "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}"; kernelParams = config.boot.kernelParams; - label = "NixOS ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})"; + label = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} (Linux ${config.boot.kernelPackages.kernel.modDirVersion})"; inherit (cfg) extensions; } // lib.optionalAttrs config.boot.initrd.enable { diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 9a4c635402d19..de6e43dd30d83 100755 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -84,7 +84,7 @@ EOF # This is a NixOS installation if it has /etc/NIXOS or a proper # /etc/os-release. -if (!-f "/etc/NIXOS" && (read_file("/etc/os-release", err_mode => "quiet") // "") !~ /^ID="?nixos"?/msx) { +if (!-f "/etc/NIXOS" && (read_file("/etc/os-release", err_mode => "quiet") // "") !~ /^ID="?@distroId@"?/msx) { die("This is not a NixOS installation!\n"); } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 00b11471e1c71..240e209591752 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -65,6 +65,7 @@ let mkdir $out/bin export localeArchive="${config.i18n.glibcLocales}/lib/locale/locale-archive" + export distroId=${config.system.nixos.distroId}; substituteAll ${./switch-to-configuration.pl} $out/bin/switch-to-configuration chmod +x $out/bin/switch-to-configuration ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' |