X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.link.xml;h=6c74b42db329dd239ea790341e3767ce4ef1c3e2;hp=2f5de23742db8fad69ece8283ca3685ce642bac9;hb=02b75c9edd61f47de7940b61b97b071b69f38a11;hpb=70a44afee385c4afadaab9a002b3f9dd44aedf4a
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index 2f5de2374..6c74b42db 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -76,6 +76,10 @@
[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.
+
+
+
+ [Match] Section Options
A link file is said to match a device if each of the entries in the
[Match] section matches, or if the section is empty.
@@ -101,7 +105,7 @@
The driver currently bound to the device,
as exposed by the udev property DRIVER
- of its parent device, or if that is not set the
+ of its parent device, or if that is not set, the
driver as exposed by ethtool -i
of the device itself.
@@ -156,6 +160,11 @@
+
+
+
+ [Link] Section Options
+
The [Link] section accepts the following
keys:
@@ -186,7 +195,7 @@
If the hardware has a persistent
MAC address, as most hardware should,
- and this is used by the kernel, nothing
+ and if it is used by the kernel, nothing
is done. Otherwise, a new MAC address
is generated which is guaranteed to be
the same on every boot for the given
@@ -222,15 +231,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