nixos/modules/system/activation/top-level.nix: allow overriding system.name #85638
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
basvandijk
force-pushed
the
virtualisation.vmName
branch
from
c3fb66d
to
ddd5831
Compare
basvandijk
changed the title
ofborg
bot
added
10.rebuild-linux: 1-10
10.rebuild-linux: 1
and removed
10.rebuild-linux: 0
labels
basvandijk
force-pushed
the
virtualisation.vmName
branch
from
ddd5831
to
51a0429
Compare
|
To confirm I didn't screw up NixOS module evaluation: |
…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
force-pushed
the
virtualisation.vmName
branch
from
51a0429
to
d06de76
Compare
|
@GrahamcOfBorg test simple |
|
This seems to have broken eval of unstable-small: https://hydra.nixos.org/jobset/nixos/unstable-small#tabs-errors |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
The toplevel derivations of systems that have
networking.hostNameset to
""(because they want their hostname to be set by DHCP) usedto be all named
nixos-system-unnamed-${config.system.nixos.label}.This makes them hard to distinguish.
A similar problem existed in NixOS tests where
vmNameis used in thetestScriptto refer to the VM. It defaulted to thenetworking.hostNamewhich when set to""won't allow you to referto the machine from the
testScript.This commit makes the
system.nameconfigurable. It still defaults to:but in case
networking.hostNameneeds to be to""thesystem.namecan be set to a distinguishable name.sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)