diff options
| author | Adrián Laviós Gomis <adrian@lavios.eu> | 2018-02-18 09:49:26 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-02-18 14:22:24 +0100 |
| commit | 7621fe4e1a6da7d61fe9e9398937bc5dd536c8be (patch) | |
| tree | 74e1ab7228396f9cfe3f521816154f349af44d2d /man | |
| parent | 9daa9346e2bfca4aa8ef6c459cf9ad8ccf81a8c9 (diff) | |
man: update NetworkManager.conf man page to account for stub-resolv.conf (#68)
NetworkManager checks if /etc/resolv.conf is a symlink to
/run/systemd/resolve/stub-resolv.conf since commit
e09503dcc43039905018b26304bfe94287211aa6. This should be
documented in the corresponding section of NetworkManager.conf(5).
https://github.com/NetworkManager/NetworkManager/pull/68
Diffstat (limited to 'man')
| -rw-r--r-- | man/NetworkManager.conf.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 9151b2414d..bbd9bf8fc0 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -312,6 +312,7 @@ no-auto-default=* <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode. If the key is unspecified, <literal>default</literal> is used, unless <filename>/etc/resolv.conf</filename> is a symlink to + <filename>/run/systemd/resolve/stub-resolv.conf</filename>, <filename>/run/systemd/resolve/resolv.conf</filename>, <filename>/lib/systemd/resolv.conf</filename> or <filename>/usr/lib/systemd/resolv.conf</filename>. |