summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2013-11-10 16:02:29 -0500
committerDave Reisner <dreisner@archlinux.org>2013-11-10 20:04:29 -0500
commit22925e1a250625e44c46a72fcdca400ab77a9ef0 (patch)
tree8a303dc7f5c0b6eca9371df6198ae45694094318 /man
parent60411ac750ec928114be80b133d9782a1cb2da62 (diff)
udev.xml: minor fixes to network link configuration
- Refer to net_setup_link, not net-setup-link - Mention the required file extension earlier
Diffstat (limited to 'man')
-rw-r--r--man/udev.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/man/udev.xml b/man/udev.xml
index 5e00a4e272..4b87f9d953 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -742,13 +742,14 @@
</refsect1>
<refsect1><title>Network Link Configuration</title>
- <para>Network link configuration is performed by the <literal>net-setup-link</literal>
+ <para>Network link configuration is performed by the <literal>net_setup_link</literal>
udev builtin.</para>
<para>The link files are read from the files located in the
system network directory <filename>/usr/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>.
+ Link files must have the extension <filename>.link</filename>; other extensions are ignored.
All link files are collectively sorted and processed in lexical order,
regardless of the directories in which they live. However, files with
identical filenames replace each other. Files in <filename>/etc</filename>
@@ -757,8 +758,7 @@
used to override a system-supplied link file with a local file if needed;
a symlink in <filename>/etc</filename> with the same name as a link file in
<filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
- disables the link file entirely. Link files must have the extension
- <filename>.link</filename>; other extensions are ignored.</para>
+ disables the link file entirely.
<para>The link file contains a <literal>[Match]</literal> section, which
determines if a given link file may be applied to a given device; and a