Merge pull request #258677 from Majiir/fix-networkd-search-domains

nixos/network-interfaces-systemd: don't set network-level domains

authored by

Linus Heckemann and committed by
GitHub
2de1be5b 1124eb9e

-3
-3
nixos/modules/tasks/network-interfaces-systemd.nix
··· 28 28 # TODO: warn the user that any address configured on those interfaces will be useless 29 29 ++ concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues cfg.vswitches); 30 30 31 - domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain); 32 31 genericNetwork = override: 33 32 let gateway = optional (cfg.defaultGateway != null && (cfg.defaultGateway.address or "") != "") cfg.defaultGateway.address 34 33 ++ optional (cfg.defaultGateway6 != null && (cfg.defaultGateway6.address or "") != "") cfg.defaultGateway6.address; ··· 40 39 }; 41 40 in optionalAttrs (gateway != [ ]) { 42 41 routes = override (map makeGateway gateway); 43 - } // optionalAttrs (domains != [ ]) { 44 - domains = override domains; 45 42 }; 46 43 47 44 genericDhcpNetworks = initrd: mkIf cfg.useDHCP {