diff options
| author | ts468 <ts468@users.noreply.github.com> | 2015-09-26 18:50:31 +0200 |
|---|---|---|
| committer | ts468 <ts468@users.noreply.github.com> | 2015-09-26 18:50:31 +0200 |
| commit | 54acc6ada32705d670bff2fc1f106bcf3b52746f (patch) | |
| tree | 07731ae38caf90f3f51ca835803c8e64b0661ca8 | |
| parent | ee7e17c6a79d2d931debaa7ee24eef0a0cde6593 (diff) | |
| parent | 6da2ea345cf92b07068fff3ba129b43e83b46471 (diff) | |
| download | nixlib-54acc6ada32705d670bff2fc1f106bcf3b52746f.tar nixlib-54acc6ada32705d670bff2fc1f106bcf3b52746f.tar.gz nixlib-54acc6ada32705d670bff2fc1f106bcf3b52746f.tar.bz2 nixlib-54acc6ada32705d670bff2fc1f106bcf3b52746f.tar.lz nixlib-54acc6ada32705d670bff2fc1f106bcf3b52746f.tar.xz nixlib-54acc6ada32705d670bff2fc1f106bcf3b52746f.tar.zst nixlib-54acc6ada32705d670bff2fc1f106bcf3b52746f.zip | |
Merge pull request #9683 from ts468/upstream.resolvconf
nixos networking module: resolvconf + dnsmasq
| -rw-r--r-- | nixos/modules/config/networking.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index f99cea7d17b1..b49f8a156d1d 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -39,6 +39,16 @@ in ''; }; + networking.extraResolvconfConf = lib.mkOption { + type = types.lines; + default = ""; + example = "libc=NO"; + description = '' + Extra configuration to append to <filename>resolvconf.conf</filename>. + ''; + }; + + networking.proxy = { default = lib.mkOption { @@ -150,6 +160,7 @@ in '' + optionalString dnsmasqResolve '' dnsmasq_conf=/etc/dnsmasq-conf.conf dnsmasq_resolv=/etc/dnsmasq-resolv.conf + '' + cfg.extraResolvconfConf + '' ''; } // (optionalAttrs config.services.resolved.enable ( |