movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 12:45:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
nixos/network-interfaces-systemd: don't set network-level domains
This commit is contained in:
Linus Heckemann 2023-10-07 08:43:49 +02:00 • committed by GitHub
commit 2de1be5b51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/tasks/network-interfaces-systemd.nix
View file

@ -28,7 +28,6 @@ let
# TODO: warn the user that any address configured on those interfaces will be useless # TODO: warn the user that any address configured on those interfaces will be useless
++ concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues cfg.vswitches); ++ concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues cfg.vswitches);
domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain);
genericNetwork = override: genericNetwork = override:
let gateway = optional (cfg.defaultGateway != null && (cfg.defaultGateway.address or "") != "") cfg.defaultGateway.address let gateway = optional (cfg.defaultGateway != null && (cfg.defaultGateway.address or "") != "") cfg.defaultGateway.address
++ optional (cfg.defaultGateway6 != null && (cfg.defaultGateway6.address or "") != "") cfg.defaultGateway6.address; ++ optional (cfg.defaultGateway6 != null && (cfg.defaultGateway6.address or "") != "") cfg.defaultGateway6.address;
@ -40,8 +39,6 @@ let
}; };
in optionalAttrs (gateway != [ ]) { in optionalAttrs (gateway != [ ]) {
routes = override (map makeGateway gateway); routes = override (map makeGateway gateway);
} // optionalAttrs (domains != [ ]) {
domains = override domains;
}; };
genericDhcpNetworks = initrd: mkIf cfg.useDHCP { genericDhcpNetworks = initrd: mkIf cfg.useDHCP {