diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-06-03 10:33:54 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-03 11:50:02 +0200 |
| commit | 718fd2243690b8c72dd1cb32f67114f304542082 (patch) | |
| tree | eab2ff48d7562170ed89add03fd2721b7f12edf0 /man | |
| parent | 9418f815280a52c1e7baf7a1a646da4e8747c044 (diff) | |
| download | NetworkManager-718fd2243690b8c72dd1cb32f67114f304542082.tar.gz | |
dns: follow resolv.conf if it is a symlink for 'rc-manager=file'
Until before 1.2.0, NetworkManager would always write resolv.conf as file, but
if /etc/resolv.conf was a symlink, it would follow the link instead of
replacing it with a file ([1], [2]).
With 1.2.0, we initially dropped that behavior and added a new 'rc-manager=none'
which writes resolv.conf to /var/run/NetworkManager and symlinks resolv.conf [3].
In case resolv.conf being already a symlink to another target, it would
not be replaced [4].
Later, we added 'rc-manager=file', which always writes /etc/resolv.conf as
file [5].
With 1.4.0, we will rename 'rc-manager=none' to 'rc-manager=symlink' [6].
This commit now fixes 'rc-manager=file' to restores the pre-1.2 behavior
and follow symlinks.
[1] 5761e328b81ce8894c2657ce0994ba401923ba35
[2] https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/324233
[3] 4805be2ed27b71a6099477d86dbc109adb41b819
[4] 583568e12f9e580cd2903811637c9f9b7a2f1088
[5] 288799713dc78bc45e2b0a9cf41d228f5d95315f
[6] cd6a469668028fbc347919ed3580275f9894a1f2
https://github.com/NetworkManager/NetworkManager/pull/7
Diffstat (limited to 'man')
| -rw-r--r-- | man/NetworkManager.conf.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 23038dbbc1..a6614e3393 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -329,7 +329,9 @@ no-auto-default=* by pointing the link <filename>/etc/resolv.conf</filename> to somewhere else.</para> <para><literal>file</literal>: NetworkManager will write - <filename>/etc/resolv.conf</filename> as file.</para> + <filename>/etc/resolv.conf</filename> as file. If it finds + a symlink, it will follow the symlink and update the target + instead.</para> <para><literal>resolvconf</literal>: NetworkManager will run resolvconf to update the DNS configuration.</para> <para><literal>netconfig</literal>: NetworkManager will run |