From 9f29cc13e7fc8afde887d2832f75b5372ec83457 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 29 Apr 2016 21:54:45 +0200 Subject: [PATCH] man: clearify rc-manager symlink setting in NetworkManager.conf --- man/NetworkManager.conf.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 95ff884c4..d6fd5ebf2 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. symlink: NetworkManager will symlink /etc/resolv.conf to its private - resolv.conf file in the runtime state directory. + resolv.conf file in the runtime state directory. If + /etc/resolv.conf + 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 /etc/resolv.conf to + somewhere else. file: NetworkManager will write /etc/resolv.conf as file. resolvconf: NetworkManager will run @@ -324,7 +329,7 @@ no-auto-default=* netconfig: NetworkManager will run netconfig to update the DNS configuration. unmanaged: don't touch - resolv.conf. + /etc/resolv.conf. none: deprecated alias for symlink.