NixOS/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 17:46:29 +09:00
Code Activity

nixos/networking: fix fqdnOrHostName when FQDN explictly set

Browse source
This commit is contained in:
Michael Hoang 2025-04-23 00:35:03 +10:00
parent b024ced1aa
commit 6c701a9573
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nixos/modules/tasks/network-interfaces.nix
View file

@ -604,17 +604,21 @@ in
networking.fqdnOrHostName = mkOption { networking.fqdnOrHostName = mkOption {
readOnly = true; readOnly = true;
type = types.str; type = types.str;
default = if cfg.domain == null then cfg.hostName else cfg.fqdn; default =
if (cfg.domain != null || opt.fqdn.highestPrio < (mkOptionDefault { }).priority) then
cfg.fqdn
else
cfg.hostName;
defaultText = literalExpression '' defaultText = literalExpression ''
if cfg.domain == null then cfg.hostName else cfg.fqdn if config.networking.domain != null || config.networking.fqdn is set then config.networking.fqdn else config.networking.hostName
''; '';
description = '' description = ''
Either the fully qualified domain name (FQDN), or just the host name if Either the fully qualified domain name (FQDN), or just the host name if
it does not exists. it does not exist.
This is a convenience option for modules to read instead of `fqdn` when This is a convenience option for modules to read instead of `fqdn` when
a mere `hostName` is also an acceptable value; this option does not a mere `hostName` is also an acceptable value; this option does not
throw an error when `domain` is unset. throw an error when `domain` or `fqdn` is unset.
''; '';
}; };