diff options
| author | Linus Heckemann <git@sphalerite.org> | 2023-10-07 08:43:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-07 08:43:49 +0200 |
| commit | 2de1be5b51c3d6fa833f1c1f222dc867dd054b31 (patch) | |
| tree | 54f359121bf4bb9f35b221453435691c8f1071f6 /nixos/modules/tasks/network-interfaces-systemd.nix | |
| parent | 1124eb9e0d7eb65199a2dc81a66df1550550d8cc (diff) | |
| parent | 0ba49949b087f0b358dafc118588f80dabcc885e (diff) | |
| download | nixpkgs-2de1be5b51c3d6fa833f1c1f222dc867dd054b31.tar nixpkgs-2de1be5b51c3d6fa833f1c1f222dc867dd054b31.tar.gz nixpkgs-2de1be5b51c3d6fa833f1c1f222dc867dd054b31.tar.bz2 nixpkgs-2de1be5b51c3d6fa833f1c1f222dc867dd054b31.tar.lz nixpkgs-2de1be5b51c3d6fa833f1c1f222dc867dd054b31.tar.xz nixpkgs-2de1be5b51c3d6fa833f1c1f222dc867dd054b31.tar.zst nixpkgs-2de1be5b51c3d6fa833f1c1f222dc867dd054b31.zip | |
Merge pull request #258677 from Majiir/fix-networkd-search-domains
nixos/network-interfaces-systemd: don't set network-level domains
Diffstat (limited to 'nixos/modules/tasks/network-interfaces-systemd.nix')
| -rw-r--r-- | nixos/modules/tasks/network-interfaces-systemd.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 86eed4214f8..53097e21c64 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -28,7 +28,6 @@ let # 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); - domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain); genericNetwork = override: let gateway = optional (cfg.defaultGateway != null && (cfg.defaultGateway.address or "") != "") cfg.defaultGateway.address ++ optional (cfg.defaultGateway6 != null && (cfg.defaultGateway6.address or "") != "") cfg.defaultGateway6.address; @@ -40,8 +39,6 @@ let }; in optionalAttrs (gateway != [ ]) { routes = override (map makeGateway gateway); - } // optionalAttrs (domains != [ ]) { - domains = override domains; }; genericDhcpNetworks = initrd: mkIf cfg.useDHCP { |