diff options
author | Lennart Poettering <lennart@poettering.net> | 2014-08-01 16:04:12 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-08-01 16:06:39 +0200 |
commit | 4e945a6f7971fd7d1f6b2c62ee3afdaff3c95ce4 (patch) | |
tree | b36f290a2aeda5bfb77d20b2953898c3d3c36382 /src/resolve/resolved.conf.in | |
parent | e70df46b9721a3d025e7a0b4ffb5893cbde5e55d (diff) |
resolved: beef up DNS server configuration logic
We now maintain two lists of DNS servers: system servers and fallback
servers.
system servers are used in combination with any per-link servers.
fallback servers are only used if there are no system servers or
per-link servers configured.
The system server list is supposed to be populated from a foreign tool's
/etc/resolv.conf (not implemented yet).
Also adds a configuration switch for LLMNR, that allows configuring
whether LLMNR shall be used simply for resolving or also for responding.
Diffstat (limited to 'src/resolve/resolved.conf.in')
-rw-r--r-- | src/resolve/resolved.conf.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in index a2391954aa..c8263d67f4 100644 --- a/src/resolve/resolved.conf.in +++ b/src/resolve/resolved.conf.in @@ -8,4 +8,6 @@ # See resolved.conf(5) for details [Resolve] -#DNS=@DNS_SERVERS@ +#DNS= +#FallbackDNS=@DNS_SERVERS@ +#LLMNR=yes |