From 09cbfea2edd8a525f54d96a45c0edc2fe3c94e56 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Nov 2018 15:26:37 +0100 Subject: Revert "resolvconf.conf: Remove forced NSCD service restart" This reverts commit d8c16bc54ac0279597733db3bd4a5edaef6fa8c0. It breaks nscd invalidation when the network configuration changes. --- nixos/modules/config/networking.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nixos/modules/config/networking.nix') diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index e6b49d4c2194..25253cf02e1d 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -247,6 +247,10 @@ 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}' -- cgit 1.4.1