diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-06-06 19:12:17 +0200 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2024-06-11 19:02:31 +0200 |
| commit | 7b529bfc476ac7a360f0276f79f25dc7baaf81a1 (patch) | |
| tree | 3f1b5cd68c1a719290b7854ab7fbb76a553cbc77 /man/systemd.network.xml | |
| parent | bus-unit-util: extend the bus call timeout for UnitFreezer (diff) | |
| download | systemd-7b529bfc476ac7a360f0276f79f25dc7baaf81a1.tar.xz systemd-7b529bfc476ac7a360f0276f79f25dc7baaf81a1.zip | |
man: document that separate /usr/local/ must not be used for config
Since we document /usr/local/lib/systemd/ and other paths for various things,
add notes that this is not supported if /usr/local is a separate partition. In
systemd.unit, I tried to add the footnote in the table where
/usr/local/lib/systemd/ is listed, but that get's rendered as '[sup]a[/sup]'
with a mangled footnote at the bottom of the table :( .
Also, split paragraphs in one place where the subject changes without any
transition.
Follow-up for 02f35b1c905ac63ba62f94efebf858412e961fc1.
Replaces https://github.com/systemd/systemd/pull/33231.
Diffstat (limited to 'man/systemd.network.xml')
| -rw-r--r-- | man/systemd.network.xml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 22462312a8..b0efd62dbd 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -39,13 +39,14 @@ <para>The <filename>.network</filename> files are read from the files located in the system network directories <filename>/usr/lib/systemd/network</filename> and - <filename>/usr/local/lib/systemd/network</filename>, the volatile runtime network directory - <filename>/run/systemd/network</filename> and the local administration network directory - <filename>/etc/systemd/network</filename>. All configuration files are collectively sorted and - processed in alphanumeric order, regardless of the directories in which they live. However, files - with identical filenames replace each other. It is recommended that each filename is prefixed with - a number smaller than <literal>70</literal> (e.g. <filename>10-eth0.network</filename>). Otherwise, the - default <filename>.network</filename> files or those generated by + <filename>/usr/local/lib/systemd/network</filename> + <xi:include href="standard-conf.xml" xpointer="usr-local-footnote" />, + the volatile runtime network directory <filename>/run/systemd/network</filename> and the local + administration network directory <filename>/etc/systemd/network</filename>. All configuration files are + collectively sorted and processed in alphanumeric order, regardless of the directories in which they + live. However, files with identical filenames replace each other. It is recommended that each filename is + prefixed with a number smaller than <literal>70</literal> (e.g. <filename>10-eth0.network</filename>). + Otherwise, the default <filename>.network</filename> files or those generated by <citerefentry><refentrytitle>systemd-network-generator.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> may take precedence over user configured files. Files in <filename>/etc/</filename> have the highest priority, files in <filename>/run/</filename> take precedence over files with the same name under |