Author: eelco
Date: Mon Mar 26 22:14:47 2012
New Revision: 33435
URL: https://nixos.org/websvn/nix/?rev=33435&sc=1
Log:
* Fix the generation of resolvconf.conf.
Modified:
nixos/trunk/modules/config/networking.nix
Modified: nixos/trunk/modules/config/networking.nix
==============================================================================
--- nixos/trunk/modules/config/networking.nix Mon Mar 26 21:01:46 2012
(r33434)
+++ nixos/trunk/modules/config/networking.nix Mon Mar 26 22:14:47 2012
(r33435)
@@ -58,18 +58,17 @@
}
{ # /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";
}
];
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
