diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-05 22:16:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 22:16:02 -0400 |
| commit | 2b4d7221a94eb3b51cfdf163efa1bb76c49c8f04 (patch) | |
| tree | c52351db2fc6b8b0ad36b61b4d4a03c161342fdd /nixos/modules | |
| parent | ce2f8bfda8201da828ae5226d71b65b4fc4fb7de (diff) | |
| parent | d8c16bc54ac0279597733db3bd4a5edaef6fa8c0 (diff) | |
| download | nixpkgs-2b4d7221a94eb3b51cfdf163efa1bb76c49c8f04.tar nixpkgs-2b4d7221a94eb3b51cfdf163efa1bb76c49c8f04.tar.gz nixpkgs-2b4d7221a94eb3b51cfdf163efa1bb76c49c8f04.tar.bz2 nixpkgs-2b4d7221a94eb3b51cfdf163efa1bb76c49c8f04.tar.lz nixpkgs-2b4d7221a94eb3b51cfdf163efa1bb76c49c8f04.tar.xz nixpkgs-2b4d7221a94eb3b51cfdf163efa1bb76c49c8f04.tar.zst nixpkgs-2b4d7221a94eb3b51cfdf163efa1bb76c49c8f04.zip | |
Merge pull request #42569 from spacefrogg/nscd-fix
resolvconf.conf: Remove forced NSCD service restart
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/config/networking.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 4101ef82f3e..48c3b41bc09 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -231,10 +231,6 @@ in # a collision with an apparently unrelated environment # variable with the same name exported by dhcpcd. interface_order='lo lo[0-9]*' - '' + optionalString config.services.nscd.enable '' - # Invalidate the nscd cache whenever resolv.conf is - # regenerated. - libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' '' + optionalString (length resolvconfOptions > 0) '' # Options as described in resolv.conf(5) resolv_conf_options='${concatStringsSep " " resolvconfOptions}' |