diff options
author | Thomas Haller <thaller@redhat.com> | 2016-10-27 11:44:10 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-10-27 11:50:24 +0200 |
commit | 1c1da147c9be0862c62ef4eb7ff053a33a1a3908 (patch) | |
tree | 68f2a521860c5485fdd7cc698a8dd948dfb3ef1c | |
parent | 209b5a57fd03b6e1d1814a3020017f4404279264 (diff) | |
download | NetworkManager-1c1da147c9be0862c62ef4eb7ff053a33a1a3908.tar.gz |
contrib/rpm: update comments in NetworkManager.conf explaining /var/lib/NetworkManager/conf.d
-rw-r--r-- | contrib/fedora/rpm/NetworkManager.conf | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.conf b/contrib/fedora/rpm/NetworkManager.conf index 675597b8d1..1294cbbe1a 100644 --- a/contrib/fedora/rpm/NetworkManager.conf +++ b/contrib/fedora/rpm/NetworkManager.conf @@ -2,18 +2,20 @@ # # See "man 5 NetworkManager.conf" for details. # -# The directory /usr/lib/NetworkManager/conf.d/ can contain additional configuration -# snippets installed by packages. These files are read before NetworkManager.conf -# and have thus lowest priority. +# The directories /usr/lib/NetworkManager/conf.d/ and /var/run/NetworkManager/conf.d/ +# can contain additional configuration snippets installed by packages. These files are +# read before NetworkManager.conf and have thus lowest priority. # The directory /etc/NetworkManager/conf.d/ can contain additional configuration -# snippets. Those snippets override the settings from this main file. +# snippets. Those snippets are merged last and overwrite the settings from this main +# file. # # The files within one conf.d/ directory are read in asciibetical order. # # If /etc/NetworkManager/conf.d/ contains a file with the same name as # /usr/lib/NetworkManager/conf.d/, the latter file is shadowed and thus ignored. # Hence, to disable loading a file from /usr/lib/NetworkManager/conf.d/ you can -# put an empty file with the same name. +# put an empty file to etc with the same name. The same applies with respect +# to the directory /var/lib/NetworkManager/conf.d. # # If two files define the same key, the one that is read afterwards will overwrite # the previous one. |