diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-01-08 11:43:09 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-01-08 11:43:09 +0100 |
commit | d9b204544b69e344bc5a6177c1b10bf7b8109aad (patch) | |
tree | 9612423bbd338167eca48a6c7c6e527c97e697c9 /man/systemd.link.xml | |
parent | networkctl: show permanent mac address if it is not used now (diff) | |
download | systemd-d9b204544b69e344bc5a6177c1b10bf7b8109aad.tar.xz systemd-d9b204544b69e344bc5a6177c1b10bf7b8109aad.zip |
man: use xi:include to avoid duplication
... and fix some unwarranted discrepancies between the two man pages.
Diffstat (limited to 'man/systemd.link.xml')
-rw-r--r-- | man/systemd.link.xml | 68 |
1 files changed, 42 insertions, 26 deletions
diff --git a/man/systemd.link.xml b/man/systemd.link.xml index 1a405e989d..9104dd7f8f 100644 --- a/man/systemd.link.xml +++ b/man/systemd.link.xml @@ -69,7 +69,13 @@ The following keys are accepted:</para> <variablelist class='network-directives'> - <varlistentry> + <!-- This list is reused in systemd.network(3), hence maintain a specific order: + 1. device matches shared between the two lists + 2. non-shared settings + 3. host matches shared between the two lists + --> + + <varlistentry id='mac-address'> <term><varname>MACAddress=</varname></term> <listitem> <para>A whitespace-separated list of hardware addresses. Use full colon-, hyphen- or dot-delimited hexadecimal. See the example below. @@ -80,7 +86,8 @@ <programlisting>MACAddress=01:23:45:67:89:ab 00-11-22-33-44-55 AABB.CCDD.EEFF</programlisting></para> </listitem> </varlistentry> - <varlistentry> + + <varlistentry id='permanent-mac-address'> <term><varname>PermanentMACAddress=</varname></term> <listitem> <para>A whitespace-separated list of hardware's permanent addresses. While @@ -91,18 +98,8 @@ of hardware addresses defined prior to this is reset.</para> </listitem> </varlistentry> - <varlistentry> - <term><varname>OriginalName=</varname></term> - <listitem> - <para>A whitespace-separated list of shell-style globs matching - the device name, as exposed by the udev property - "INTERFACE". This cannot 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> + + <varlistentry id='path'> <term><varname>Path=</varname></term> <listitem> <para>A whitespace-separated list of shell-style globs matching @@ -110,23 +107,27 @@ <varname>ID_PATH</varname>.</para> </listitem> </varlistentry> - <varlistentry> + + <varlistentry id='driver'> <term><varname>Driver=</varname></term> <listitem> <para>A whitespace-separated list of shell-style globs matching the driver currently bound to the - device, as exposed by the udev property <varname>ID_NET_DRIVER</varname> of its parent device, or if that - is not set, the driver as exposed by <command>ethtool -i</command> of the device itself.</para> + device, as exposed by the udev property <varname>ID_NET_DRIVER</varname> of its parent device, or + if that is not set, the driver as exposed by <command>ethtool -i</command> of the device itself. + If the list is prefixed with a "!", the test is inverted.</para> </listitem> </varlistentry> - <varlistentry> + + <varlistentry id='type'> <term><varname>Type=</varname></term> <listitem> - <para>A whitespace-separated list of shell-style globs matching - the device type, as exposed by the udev - property <varname>DEVTYPE</varname>.</para> + <para>A whitespace-separated list of shell-style globs matching the device type, as exposed by + the udev property <literal>DEVTYPE</literal>. If the list is prefixed with a "!", the test is + inverted.</para> </listitem> </varlistentry> - <varlistentry> + + <varlistentry id='property'> <term><varname>Property=</varname></term> <listitem> <para>A whitespace-separated list of udev property name with its value after a equal @@ -141,7 +142,18 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><varname>OriginalName=</varname></term> + <listitem> + <para>A whitespace-separated list of shell-style globs matching the device name, as exposed by the + udev property "INTERFACE". This cannot 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 id='host'> <term><varname>Host=</varname></term> <listitem> <para>Matches against the hostname or machine ID of the host. See <varname>ConditionHost=</varname> in @@ -151,7 +163,8 @@ </para> </listitem> </varlistentry> - <varlistentry> + + <varlistentry id='virtualization'> <term><varname>Virtualization=</varname></term> <listitem> <para>Checks whether the system is executed in a virtualized environment and optionally test @@ -162,7 +175,8 @@ </para> </listitem> </varlistentry> - <varlistentry> + + <varlistentry id='kernel-command-line'> <term><varname>KernelCommandLine=</varname></term> <listitem> <para>Checks whether a specific kernel command line option is set. See @@ -173,7 +187,8 @@ </para> </listitem> </varlistentry> - <varlistentry> + + <varlistentry id='kernel-version'> <term><varname>KernelVersion=</varname></term> <listitem> <para>Checks whether the kernel version (as reported by <command>uname -r</command>) matches a certain @@ -184,7 +199,8 @@ </para> </listitem> </varlistentry> - <varlistentry> + + <varlistentry id='architecture'> <term><varname>Architecture=</varname></term> <listitem> <para>Checks whether the system is running on a specific architecture. See |