diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-27 12:25:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 12:25:14 +0200 |
| commit | b9ddfd63b7ef6950a5c9afad2add46b3963307ae (patch) | |
| tree | 62f66d3164eeb85888569c6ff052753133c14779 /nixos/modules | |
| parent | a77efe85da21d31b87edb22e6892988b6fbde444 (diff) | |
| parent | 70d3697f8c913b25e4632cb483834031c25fd1a1 (diff) | |
| download | nixlib-b9ddfd63b7ef6950a5c9afad2add46b3963307ae.tar nixlib-b9ddfd63b7ef6950a5c9afad2add46b3963307ae.tar.gz nixlib-b9ddfd63b7ef6950a5c9afad2add46b3963307ae.tar.bz2 nixlib-b9ddfd63b7ef6950a5c9afad2add46b3963307ae.tar.lz nixlib-b9ddfd63b7ef6950a5c9afad2add46b3963307ae.tar.xz nixlib-b9ddfd63b7ef6950a5c9afad2add46b3963307ae.tar.zst nixlib-b9ddfd63b7ef6950a5c9afad2add46b3963307ae.zip | |
Merge pull request #162996 from alyssais/resolvconf-disable
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/config/resolvconf.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix index cd0ed491383c..4499481811fd 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 |