public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: Allow empty hostnames again

Browse Source 
This fixes a regression from 993baa587c4 which requires
networking.hostName to be a valid DNS label [0].
Unfortunately we missed the fact that the hostnames may also be empty,
if the user wants to obtain it from a DHCP server. This is even required
by a few modules/images (e.g. Amazon EC2, Azure, and Google Compute).

[0]: https://github.com/NixOS/nixpkgs/pull/76542#issuecomment-638138666
This commit is contained in:
Michael Weiss 2020-06-03 15:12:21 +02:00
parent 86a8c3f485
commit a6afdbb70b
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/tasks/network-interfaces.nix
View File

@ -381,7 +381,7 @@ in
# syntax). Note: We also allow underscores for compatibility/legacy # syntax). Note: We also allow underscores for compatibility/legacy
# reasons (as undocumented feature): # reasons (as undocumented feature):
type = types.strMatching type = types.strMatching
"^[[:alpha:]]([[:alnum:]_-]{0,61}[[:alnum:]])?$"; "^$|^[[:alpha:]]([[:alnum:]_-]{0,61}[[:alnum:]])?$";
description = '' description = ''
The name of the machine. Leave it empty if you want to obtain it from a The name of the machine. Leave it empty if you want to obtain it from a
DHCP server (if using DHCP). The hostname must be a valid DNS label (see DHCP server (if using DHCP). The hostname must be a valid DNS label (see