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: - + + + MACAddress= A whitespace-separated list of hardware addresses. Use full colon-, hyphen- or dot-delimited hexadecimal. See the example below. @@ -80,7 +86,8 @@ MACAddress=01:23:45:67:89:ab 00-11-22-33-44-55 AABB.CCDD.EEFF - + + PermanentMACAddress= A whitespace-separated list of hardware's permanent addresses. While @@ -91,18 +98,8 @@ of hardware addresses defined prior to this is reset. - - OriginalName= - - 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. - - - + + Path= A whitespace-separated list of shell-style globs matching @@ -110,23 +107,27 @@ ID_PATH. - + + Driver= A whitespace-separated list of shell-style globs matching the driver currently bound to the - device, as exposed by the udev property ID_NET_DRIVER of its parent device, or if that - is not set, the driver as exposed by ethtool -i of the device itself. + device, as exposed by the udev property ID_NET_DRIVER of its parent device, or + if that is not set, the driver as exposed by ethtool -i of the device itself. + If the list is prefixed with a "!", the test is inverted. - + + Type= - A whitespace-separated list of shell-style globs matching - the device type, as exposed by the udev - property DEVTYPE. + A whitespace-separated list of shell-style globs matching the device type, as exposed by + the udev property DEVTYPE. If the list is prefixed with a "!", the test is + inverted. - + + Property= A whitespace-separated list of udev property name with its value after a equal @@ -141,7 +142,18 @@ + + OriginalName= + + 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. + + + + Host= Matches against the hostname or machine ID of the host. See ConditionHost= in @@ -151,7 +163,8 @@ - + + Virtualization= Checks whether the system is executed in a virtualized environment and optionally test @@ -162,7 +175,8 @@ - + + KernelCommandLine= Checks whether a specific kernel command line option is set. See @@ -173,7 +187,8 @@ - + + KernelVersion= Checks whether the kernel version (as reported by uname -r) matches a certain @@ -184,7 +199,8 @@ - + + Architecture= Checks whether the system is running on a specific architecture. See diff --git a/man/systemd.network.xml b/man/systemd.network.xml index de1a854494..c76b81815b 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -3,7 +3,8 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - + systemd.network @@ -86,60 +87,13 @@ The following keys are accepted: - - MACAddress= - - A whitespace-separated list of hardware addresses. Use full colon-, hyphen- or dot-delimited hexadecimal. See the example below. - This option may appear more than once, in which case the lists are merged. If the empty string is assigned to this option, the list - of hardware addresses defined prior to this is reset. + + + + + + - Example: - MACAddress=01:23:45:67:89:ab 00-11-22-33-44-55 AABB.CCDD.EEFF - - - - PermanentMACAddress= - - A whitespace-separated list of hardware's permanent addresses. While - MACAddress= matches the device's current MAC address, this matches the - device's permanent MAC address, which may be different from the current one. Use full - colon-, hyphen- or dot-delimited hexadecimal. This option may appear more than once, in - which case the lists are merged. If the empty string is assigned to this option, the list - of hardware addresses defined prior to this is reset. - - - - Path= - - A whitespace-separated list of shell-style globs - matching the persistent path, as exposed by the udev - property ID_PATH. If the list is - prefixed with a "!", the test is inverted; i.e. it is - true when ID_PATH does not match any - item in the list. - - - - Driver= - - A whitespace-separated list of shell-style globs - matching the driver currently bound to the device, as - exposed by the udev property ID_NET_DRIVER - of its parent device, or if that is not set the driver - as exposed by ethtool -i of the - device itself. If the list is prefixed with a "!", the - test is inverted. - - - - Type= - - A whitespace-separated list of shell-style globs - matching the device type, as exposed by the udev property - DEVTYPE. If the list is prefixed with - a "!", the test is inverted. - - Name= @@ -148,21 +102,7 @@ list is prefixed with a "!", the test is inverted. - - Property= - - A whitespace-separated list of udev property name with its value after a equal - (=). If multiple properties are specified, the test results are ANDed. - If the list is prefixed with a "!", the test is inverted. If a value contains white - spaces, then please quote whole key and value pair. If a value contains quotation, then - please escape the quotation with \. - Example: if a .network file has the following: - Property=ID_MODEL_ID=9999 "ID_VENDOR_FROM_DATABASE=vendor name" "KEY=with \"quotation\"" - then, the .network file matches only when an interface has all the above three properties. - - - WLANInterfaceType= @@ -175,6 +115,7 @@ + SSID= @@ -183,6 +124,7 @@ + BSSID= @@ -193,61 +135,12 @@ prior to this is reset. - - Host= - - Matches against the hostname or machine ID of the host. See - ConditionHost= in - systemd.unit5 - for details. When prefixed with an exclamation mark (!), the result is negated. - If an empty string is assigned, then previously assigned value is cleared. - - - - - Virtualization= - - Checks whether the system is executed in a virtualized environment and optionally test - whether it is a specific implementation. See ConditionVirtualization= in - systemd.unit5 - for details. When prefixed with an exclamation mark (!), the result is negated. - If an empty string is assigned, then previously assigned value is cleared. - - - - - KernelCommandLine= - - Checks whether a specific kernel command line option is set. See - ConditionKernelCommandLine= in - systemd.unit5 - for details. When prefixed with an exclamation mark (!), the result is negated. - If an empty string is assigned, then previously assigned value is cleared. - - - - - KernelVersion= - - Checks whether the kernel version (as reported by uname -r) matches a - certain expression. See ConditionKernelVersion= in - systemd.unit5 - for details. When prefixed with an exclamation mark (!), the result is negated. - If an empty string is assigned, then previously assigned value is cleared. - - - - - Architecture= - - Checks whether the system is running on a specific architecture. See - ConditionArchitecture= in - systemd.unit5 - for details. When prefixed with an exclamation mark (!), the result is negated. - If an empty string is assigned, then previously assigned value is cleared. - - - + + + + + +