diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 99cb27961..e662d43a8 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -45,6 +45,7 @@ /etc/NetworkManager/NetworkManager.conf, /etc/NetworkManager/conf.d/name.conf, + /var/run/NetworkManager/conf.d/name.conf, /usr/lib/NetworkManager/conf.d/name.conf, /var/lib/NetworkManager/NetworkManager-intern.conf @@ -67,10 +68,13 @@ These will be read in order, with later files overriding earlier ones. Packages might install further configuration snippets to /usr/lib/NetworkManager/conf.d. This directory is parsed first, even before NetworkManager.conf. - The loading of a file /usr/lib/NetworkManager/conf.d/name.conf + Scripts can also put per-boot configuration into /var/run/NetworkManager/conf.d. + This directory is parsed second, also before NetworkManager.conf. + The loading of a file /var/run/NetworkManager/conf.d/name.conf can be prevented by adding a file /etc/NetworkManager/conf.d/name.conf. - In this case, the file from the etc configuration shadows the file from the - system configuration directory. + Likewise, a file /usr/lib/NetworkManager/conf.d/name.conf + can be shadowed by putting a file of the same name to either /etc/NetworkManager/conf.d + or /var/run/NetworkManager/conf.d. NetworkManager can overwrite certain user configuration options via D-Bus or other internal