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=debe65ee5663bfce352874df5681d2572fe6220b;hb=02b75c9edd61f47de7940b61b97b071b69f38a11;hpb=eac684ef1c29684b1bcd27a89c38c202e568e469
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index debe65ee5..6c74b42db 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -53,12 +53,12 @@
Description
- Network link configuration is performed by the net_setup_link
+ Network link configuration is performed by the net_setup_link
udev builtin.
The link files are read from the files located in the
system network directory /usr/lib/systemd/network,
- the volatile runtime network directory /run/systemd/network
+ the volatile runtime network directory /run/systemd/network,
and the local administration network directory /etc/systemd/network.
Link files must have the extension .link; other extensions are ignored.
All link files are collectively sorted and processed in lexical order,
@@ -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,22 +231,32 @@
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
The name is set based on entries in
the udev's Hardware Database with the key
- ID_NET_NAME_FROM_DATABASE
- .
+ ID_NET_NAME_FROM_DATABASE.
+
@@ -245,8 +264,8 @@
The name is set based on information given by
the firmware for on-board devices, as exported by
- the udev property ID_NET_NAME_ONBOARD
- .
+ the udev property ID_NET_NAME_ONBOARD.
+
@@ -254,8 +273,8 @@
The name is set based on information given by
the firmware for hot-plug devices, as exported by
- the udev property ID_NET_NAME_SLOT
- .
+ the udev property ID_NET_NAME_SLOT.
+
@@ -329,7 +348,7 @@
magic
- Wake on receipt of a magic packet
+ Wake on receipt of a magic packet.
@@ -348,25 +367,23 @@
Example
- /etc/systemd/network/bridge.netdev
-
- [NetDev]
-Name=bridge0
-Kind=bridge
-
-
-
-
- Example
-
- /etc/systemd/network/vlan1.netdev
+ /etc/systemd/network/wireless.link
- [NetDev]
-Name=vlan1
-Kind=vlan
+ [Match]
+MACAddress=12:34:56:78:9a:bc
+Driver=brcmsmac
+Path=pci-0000:02:00.0-*
+Type=wlan
+Virtualization=no
+Host=my-laptop
+Architecture=x86-64
-[VLAN]
-Id=1
+[Link]
+Name=wireless0
+MTUBytes=1450
+BitsPerSecond=10M
+WakeOnLan=magic
+MACAddress=cb:a9:87:65:43:21