diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-10-23 13:31:42 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-10-23 13:33:09 +0200 |
| commit | a5e3016fc96d5c765c5d390ebb9ce380f11cb99c (patch) | |
| tree | 4da35e848c1c1ea9280cff100de01a16cfacc8d0 | |
| parent | b8b47babd28c4fac20e352298d53bf0ece91817d (diff) | |
| download | NetworkManager-a5e3016fc96d5c765c5d390ebb9ce380f11cb99c.tar.gz | |
man: document /var/run/NetworkManager/conf.d directory
| -rw-r--r-- | man/NetworkManager.conf.xml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 99cb279613..e662d43a82 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -45,6 +45,7 @@ <refsynopsisdiv> <para><filename>/etc/NetworkManager/NetworkManager.conf</filename>, <filename>/etc/NetworkManager/conf.d/<replaceable>name</replaceable>.conf</filename>, + <filename>/var/run/NetworkManager/conf.d/<replaceable>name</replaceable>.conf</filename>, <filename>/usr/lib/NetworkManager/conf.d/<replaceable>name</replaceable>.conf</filename>, <filename>/var/lib/NetworkManager/NetworkManager-intern.conf</filename> </para> @@ -67,10 +68,13 @@ These will be read in order, with later files overriding earlier ones. Packages might install further configuration snippets to <literal>/usr/lib/NetworkManager/conf.d</literal>. This directory is parsed first, even before <literal>NetworkManager.conf</literal>. - The loading of a file <literal>/usr/lib/NetworkManager/conf.d/<replaceable>name</replaceable>.conf</literal> + Scripts can also put per-boot configuration into <literal>/var/run/NetworkManager/conf.d</literal>. + This directory is parsed second, also before <literal>NetworkManager.conf</literal>. + The loading of a file <literal>/var/run/NetworkManager/conf.d/<replaceable>name</replaceable>.conf</literal> can be prevented by adding a file <literal>/etc/NetworkManager/conf.d/<replaceable>name</replaceable>.conf</literal>. - In this case, the file from the etc configuration shadows the file from the - system configuration directory. + Likewise, a file <literal>/usr/lib/NetworkManager/conf.d/<replaceable>name</replaceable>.conf</literal> + can be shadowed by putting a file of the same name to either <literal>/etc/NetworkManager/conf.d</literal> + or <literal>/var/run/NetworkManager/conf.d</literal>. </para> <para> NetworkManager can overwrite certain user configuration options via D-Bus or other internal |