JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix the generation of resolvconf.conf.

Browse Source 
svn path=/nixos/trunk/; revision=33435
This commit is contained in:
Eelco Dolstra 2012-03-26 22:14:47 +00:00
parent e9d641014d
commit da6046ef6b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/config/networking.nix
View File

@ -58,18 +58,17 @@ in
} }
{ # /etc/resolvconf.conf: Configuration for openresolv. { # /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 # This is the default, but we must set it here to prevent
# a collision with an apparently unrelated environment # a collision with an apparently unrelated environment
# variable with the same name exported by dhcpcd. # variable with the same name exported by dhcpcd.
interface_order='lo lo[0-9]*' interface_order='lo lo[0-9]*'
'' + optionalString config.services.nscd.enable '' + optionalString config.services.nscd.enable ''
''
# Invalidate the nscd cache whenever resolv.conf is # Invalidate the nscd cache whenever resolv.conf is
# regenerated. # regenerated.
libc_restart='${pkgs.upstart}/sbin/start invalidate-nscd' libc_restart='${pkgs.upstart}/sbin/start invalidate-nscd'
''; '' );
target = "resolvconf.conf"; target = "resolvconf.conf";
} }
]; ];