diff options
| author | Ryan Lahfa <masterancpp@gmail.com> | 2023-01-15 17:39:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-15 17:39:55 +0100 |
| commit | b42ea74b96e1f5e2a006a6afb95efc57de66ee05 (patch) | |
| tree | 66854a2457f0c39aaa0b675dad7700392d8ebf36 /nixos/modules/virtualisation | |
| parent | df1262baae9b310c0f4dcad35482465c267d3fbf (diff) | |
| parent | d3528cdc3dbe82a0551707fe869aec02bba72956 (diff) | |
Merge pull request #206655 from vlinkz/distroname
nixos/version: add system.nixos.distroName and system.nixos.distroId options
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/lxc-container.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/virtualbox-image.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index 4963d9f3f9e4..416a2f905487 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -123,8 +123,8 @@ in architecture = builtins.elemAt (builtins.match "^([a-z0-9_]+).+" (toString pkgs.system)) 0; creation_date = 1; properties = { - description = "NixOS ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.system}"; - os = "nixos"; + description = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.system}"; + os = "${config.system.nixos.distroId}"; release = "${config.system.nixos.codeName}"; }; templates = templates.properties; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 0c095c01ad80..2ea23d958cf7 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -41,7 +41,7 @@ in { }; vmName = mkOption { type = types.str; - default = "NixOS ${config.system.nixos.label} (${pkgs.stdenv.hostPlatform.system})"; + default = "${config.system.nixos.distroName} ${config.system.nixos.label} (${pkgs.stdenv.hostPlatform.system})"; description = lib.mdDoc '' The name of the VirtualBox appliance. ''; |