JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/resolvconf: allow disabling

Browse Source 
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.
This commit is contained in:
Alyssa Ross 2022-01-20 18:21:56 +00:00
parent 8f176cfe2c
commit 70d3697f8c
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
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