Author: simons
Date: Wed Feb 29 21:25:12 2012
New Revision: 32711
URL: https://nixos.org/websvn/nix/?rev=32711&sc=1
Log:
modules/config/networking.nix: list extraHosts *after* the local hostname
This change allows using extraHosts to specify additional aliases for 127.0.0.1
without overriding the local hostname in the process.
Modified:
nixos/trunk/modules/config/networking.nix
Modified: nixos/trunk/modules/config/networking.nix
==============================================================================
--- nixos/trunk/modules/config/networking.nix Wed Feb 29 20:38:33 2012
(r32710)
+++ nixos/trunk/modules/config/networking.nix Wed Feb 29 21:25:12 2012
(r32711)
@@ -49,10 +49,10 @@
{ # /etc/hosts: Hostname-to-IP mappings.
source = pkgs.writeText "hosts"
''
- ${cfg.extraHosts}
${optionalString (cfg.hostName != "")
"127.0.0.1 ${hostnameWithDomain} ${cfg.hostName}"}
127.0.0.1 localhost ${localhostWithDomain}
+ ${cfg.extraHosts}
'';
target = "hosts";
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
