fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 15:20:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

man: use /run instead of /var/run

Browse source 
/var/run is just a compatibility symlink, according to file-hierarchy(7).
This commit is contained in:
Lubomir Rintel 2016-11-03 16:58:42 +01:00
parent b8785c8c3c
commit bcad38ac31
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
man/NetworkManager.conf.xml
View file

@ -45,7 +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>/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>
@ -68,13 +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>.
Scripts can also put per-boot configuration into <literal>/var/run/NetworkManager/conf.d</literal>.
Scripts can also put per-boot configuration into <literal>/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>
The loading of a file <literal>/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>.
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>.
or <literal>/run/NetworkManager/conf.d</literal>.
</para>
<para>
NetworkManager can overwrite certain user configuration options via D-Bus or other internal
@ -207,7 +207,7 @@ plugins-=remove-me
<para>When the default wired connection is deleted or saved
to a new persistent connection by a plugin, the device is
added to a list in the file
<filename>/var/run/NetworkManager/no-auto-default.state</filename>
<filename>/run/NetworkManager/no-auto-default.state</filename>
to prevent creating the default connection for that device
again.</para>
<para>See <xref linkend="device-spec"/> for the syntax how to