X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.link.xml;h=ecf7954d1b3c26b95aa5770282361c4d3d428d74;hb=5fae368bda9419d9d378ea32077c8fd183dd4b81;hp=05effc3b713c1a1e7c0ff6beb1e6dfcc311ab9d6;hpb=102bd40e1ed71c7ab980a90435a1c23d4c786c63;p=elogind.git
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 05effc3b7..ecf7954d1 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -71,11 +71,17 @@
/usr/lib, pointing to /dev/null,
disables the link file entirely.
- The link file contains a [Match] section, which
- determines if a given link file may be applied to a given device; and a
- [Link] section specifying how the device should be
- configured. The first (in lexical order) of the link files that matches
- a given device is applied.
+ The link file contains a
+ [Match] section, which determines
+ if a given link file may be applied to a given device,
+ as well as a [Link] 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
+ 99-default.link is shipped by the
+ system, any user-supplied .link
+ should hence have a lexically earlier name to be
+ considered at all.
@@ -92,13 +98,25 @@
The hardware address.
+
+ OriginalName=
+
+ 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.
+
+
Path=
- The persistent path, as exposed by the
- udev property ID_PATH. May
- contain shell style globs.
-
+ The persistent path, as exposed by the
+ udev property ID_PATH. May
+ contain shell style globs.
+
Driver=
@@ -231,15 +249,25 @@
be set. NamePolicy may be
disabled by specifying
net.ifnames=0 on the kernel
- commandline. Each of the policies may fail, and
+ command line. Each of the policies may fail, and
the first successful one is used. The name is
not set directly, but is exported to udev as
the property ID_NET_NAME,
which is, by default, used by a udev rule to set
- NAME. The available policies
- are:
+ NAME. If the name has already
+ been set by userspace, no renaming is performed.
+ The available policies are:
+
+ kernel
+
+ If the kernel claims that the name it
+ has set for a device is predictable, then
+ no renaming is performed.
+
+
+
database
@@ -385,6 +413,12 @@ MACAddress=cb:a9:87:65:43:21
,
udevadm8
+ ,
+
+ systemd.netdev5
+ ,
+
+ systemd.network5