diff options
| author | Christian Kauhaus <kc@flyingcircus.io> | 2019-11-29 12:08:34 +0100 |
|---|---|---|
| committer | Christian Kauhaus <kc@flyingcircus.io> | 2019-11-29 12:08:34 +0100 |
| commit | 918c2ca01aabb31ec2d6c033a14039d0adbe87de (patch) | |
| tree | 57eb2a5620c252337c2391cad28d9ef699596d9c /nixos/modules/config | |
| parent | 724133984f066ee7ad1592f08ae886a718eb31c6 (diff) | |
Remove networking.hostConf option
This PR is part of the networking.* namespace cleanup. We feel that
networking.hostConf is rarely used and provides little value compared to
using environment.etc."host.conf" directly.
Provide sensible default: multi on
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/networking.nix | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index a89667ea221c..3560e579e47c 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -41,19 +41,6 @@ in ''; }; - networking.hostConf = lib.mkOption { - type = types.lines; - default = "multi on"; - example = '' - multi on - reorder on - trim lan - ''; - description = '' - The contents of <filename>/etc/host.conf</filename>. See also <citerefentry><refentrytitle>host.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. - ''; - }; - networking.timeServers = mkOption { default = [ "0.nixos.pool.ntp.org" @@ -186,7 +173,9 @@ in ''; # /etc/host.conf: resolver configuration file - "host.conf".text = cfg.hostConf; + "host.conf".text = '' + multi on + ''; } // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") { # /etc/rpc: RPC program numbers. |