Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 1c07a106d284
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7d061cefb7ce
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 20, 2020

  1. nixos/modules/system/activation/top-level.nix: allow overriding syste… 

    …m.name

The toplevel derivations of systems that have `networking.hostName`
set to `""` (because they want their hostname to be set by DHCP) used
to be all named
`nixos-system-unnamed-${config.system.nixos.label}`.
This makes them hard to distinguish.

A similar problem existed in NixOS tests where `vmName` is used in the
`testScript` to refer to the VM. It defaulted to the
`networking.hostName` which when set to `""` won't allow you to refer
to the machine from the `testScript`.

This commit makes the `system.name` configurable. It still defaults to:

```
if config.networking.hostName == ""
then "unnamed"
else config.networking.hostName;
```

but in case `networking.hostName` needs to be to `""` the
`system.name` can be set to a distinguishable name.
    @basvandijk
    basvandijk committed Jul 20, 2020
    Copy the full SHA
    d06de76 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #85638 from basvandijk/virtualisation.vmName 

    nixos/modules/system/activation/top-level.nix: allow overriding system.name
    @basvandijk
    basvandijk committed Jul 20, 2020
    Copy the full SHA
    7d061ce View commit details
    Browse the repository at this point in the history