alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #162996 from alyssais/resolvconf-disable

Browse source
This commit is contained in:
Sandro 2022-03-27 12:25:14 +02:00 committed by GitHub
parent a77efe85da 70d3697f8c
commit b9ddfd63b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/config/resolvconf.nix
View file

@ -47,8 +47,8 @@ in
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = !(config.environment.etc ? "resolv.conf");
internal = true; defaultText = literalExpression ''!(config.environment.etc ? "resolv.conf")'';
description = '' description = ''
DNS configuration is managed by resolvconf. DNS configuration is managed by resolvconf.
''; '';
@ -110,8 +110,6 @@ in
config = mkMerge [ config = mkMerge [
{ {
networking.resolvconf.enable = !(config.environment.etc ? "resolv.conf");
environment.etc."resolvconf.conf".text = environment.etc."resolvconf.conf".text =
if !cfg.enable then if !cfg.enable then
# Force-stop any attempts to use resolvconf # Force-stop any attempts to use resolvconf