diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-04-29 21:54:45 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-04-30 03:16:41 +0200 |
| commit | 9f29cc13e7fc8afde887d2832f75b5372ec83457 (patch) | |
| tree | ef02dc9680589e7e6e146faa2083e25c714b8707 /man | |
| parent | a47c13a7a2cd66644adf2459690f9c3bb96235ab (diff) | |
| download | NetworkManager-9f29cc13e7fc8afde887d2832f75b5372ec83457.tar.gz | |
man: clearify rc-manager symlink setting in NetworkManager.conf
Diffstat (limited to 'man')
| -rw-r--r-- | man/NetworkManager.conf.xml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 95ff884c46..d6fd5ebf21 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -316,7 +316,12 @@ no-auto-default=* always write resolv.conf to its runtime state directory.</para> <para><literal>symlink</literal>: NetworkManager will symlink <filename>/etc/resolv.conf</filename> to its private - resolv.conf file in the runtime state directory.</para> + resolv.conf file in the runtime state directory. If + <filename>/etc/resolv.conf</filename> + already is a symlink pointing to a different location, the file + will not be modified. This allows the user to disable managing + 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> <para><literal>resolvconf</literal>: NetworkManager will run @@ -324,7 +329,7 @@ no-auto-default=* <para><literal>netconfig</literal>: NetworkManager will run netconfig to update the DNS configuration.</para> <para><literal>unmanaged</literal>: don't touch - <filename>resolv.conf</filename>.</para> + <filename>/etc/resolv.conf</filename>.</para> <para><literal>none</literal>: deprecated alias for <literal>symlink</literal>.</para> </listitem> |