X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.link.xml;h=6c74b42db329dd239ea790341e3767ce4ef1c3e2;hb=a0132af247c4781bb821ab6b9e1e4f564f0c9fde;hp=f73182aca9da124a80ecae6c63586038d5be2ee1;hpb=b8bde11658366290521e3d03316378b482600323;p=elogind.git
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index f73182aca..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.
@@ -156,6 +160,11 @@
+
+
+
+ [Link] Section Options
+
The [Link] section accepts the following
keys:
@@ -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