From da6046ef6b1fb6f2f0f8b9756962d5b705460dd8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 26 Mar 2012 22:14:47 +0000 Subject: [PATCH] * Fix the generation of resolvconf.conf. svn path=/nixos/trunk/; revision=33435 --- modules/config/networking.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/config/networking.nix b/modules/config/networking.nix index 591c758b299..5065fc22f2c 100644 --- a/modules/config/networking.nix +++ b/modules/config/networking.nix @@ -58,18 +58,17 @@ in } { # /etc/resolvconf.conf: Configuration for openresolv. - source = pkgs.writeText "resolvconf.conf" + source = pkgs.writeText "resolvconf.conf" ( '' # This is the default, but we must set it here to prevent # 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 - '' + '' + optionalString config.services.nscd.enable '' # Invalidate the nscd cache whenever resolv.conf is # regenerated. libc_restart='${pkgs.upstart}/sbin/start invalidate-nscd' - ''; + '' ); target = "resolvconf.conf"; } ];