From cd18f5574aca8a2251eacba1b489bfb96fde527e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 20 Jan 2022 18:21:56 +0000 Subject: nixos/resolvconf: allow disabling For systems without internet connections, it doesn't make sense to require the existence of an /etc/resolv.conf file to disable resolvconf, so let's expose networking.resolveconf.enable as a public option that can be set to false. --- nixos/modules/config/resolvconf.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix index cd0ed491383..4499481811f 100644 --- a/nixos/modules/config/resolvconf.nix +++ b/nixos/modules/config/resolvconf.nix @@ -47,8 +47,8 @@ in enable = mkOption { type = types.bool; - default = false; - internal = true; + default = !(config.environment.etc ? "resolv.conf"); + defaultText = literalExpression ''!(config.environment.etc ? "resolv.conf")''; description = '' DNS configuration is managed by resolvconf. ''; @@ -110,8 +110,6 @@ in config = mkMerge [ { - networking.resolvconf.enable = !(config.environment.etc ? "resolv.conf"); - environment.etc."resolvconf.conf".text = if !cfg.enable then # Force-stop any attempts to use resolvconf -- cgit 1.4.1