X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.link.xml;h=ecf7954d1b3c26b95aa5770282361c4d3d428d74;hb=78eb158a20e2bee772f6e49d8b432b98f68cbb55;hp=6c74b42db329dd239ea790341e3767ce4ef1c3e2;hpb=3f85ef0f05ffc51e19f86fb83a1c51e8e3cd6817;p=elogind.git

diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 6c74b42db..ecf7954d1 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -71,11 +71,17 @@
                 <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
                 disables the link file entirely.</para>
 
-                <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
-                <literal>[Link]</literal> section specifying how the device should be
-                configured. The first (in lexical order) of the link files that matches
-                a given device is applied.</para>
+                <para>The link file contains a
+                <literal>[Match]</literal> section, which determines
+                if a given link file may be applied to a given device,
+                as well as a <literal>[Link]</literal> section specifying how
+                the device should be configured. The first (in lexical
+                order) of the link files that matches a given device
+                is applied. Note that a default file
+                <filename>99-default.link</filename> is shipped by the
+                system, any user-supplied <filename>.link</filename>
+                should hence have a lexically earlier name to be
+                considered at all.</para>
         </refsect1>
 
         <refsect1>
@@ -92,13 +98,25 @@
                                         <para>The hardware address.</para>
                                 </listitem>
                         </varlistentry>
+                        <varlistentry>
+                                <term><varname>OriginalName=</varname></term>
+                                <listitem>
+                                        <para>The device name, as exposed by the udev
+                                        property "INTERFACE". May contain shell style
+                                        globs. This can not be used to match on names
+                                        that have already been changed from userspace.
+                                        Caution is advised when matching on
+                                        kernel-assigned names, as they are known to
+                                        be unstable between reboots.</para>
+                                </listitem>
+                        </varlistentry>
                         <varlistentry>
                                 <term><varname>Path=</varname></term>
                                 <listitem>
-                                <para>The persistent path, as exposed by the
-                                udev property <literal>ID_PATH</literal>. May
-                                contain shell style globs.</para>
-                        </listitem>
+                                        <para>The persistent path, as exposed by the
+                                        udev property <literal>ID_PATH</literal>. May
+                                        contain shell style globs.</para>
+                                </listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><varname>Driver=</varname></term>
@@ -395,6 +413,12 @@ MACAddress=cb:a9:87:65:43:21</programlisting>
                         </citerefentry>,
                         <citerefentry>
                                 <refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum>
+                        </citerefentry>,
+                        <citerefentry>
+                                <refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum>
+                        </citerefentry>,
+                        <citerefentry>
+                                <refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum>
                         </citerefentry>
                 </para>
         </refsect1>