picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2707 from teg/man-network

Browse source 
network: minor manpage clarifications
This commit is contained in:
Martin Pitt 2016-02-23 08:25:13 +01:00
parent 548bd139fe 788f37c725
commit 16fe5e8b1d
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
man/systemd.link.xml
View file

@ -82,6 +82,10 @@
shipped by the system, any user-supplied
<filename>.link</filename> should hence have a lexically earlier
name to be considered at all.</para>
<para>See
<citerefentry><refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum></citerefentry>
for diagnosing problems with <filename>.link</filename> files.</para>
</refsect1>
<refsect1>

14
man/systemd.network.xml
View file

@ -270,8 +270,10 @@
<term><varname>IPv6Token=</varname></term>
<listitem>
<para>An IPv6 address with the top 64 bits unset. When set, indicates the
64-bit interface part of SLAAC IPv6 addresses for this link. By default,
it is autogenerated.</para>
64-bit interface part of SLAAC IPv6 addresses for this link. Note that
the token is only ever used for SLAAC, and not for DHCPv6 addresses, even
in the case DHCP is requested by router advertisment. By default, the
token is autogenerated.</para>
</listitem>
</varlistentry>
<varlistentry>
@ -368,11 +370,9 @@
<varlistentry>
<term><varname>BindCarrier=</varname></term>
<listitem>
<para>A port or a list of ports. When set, controls the
behavior of the current interface. When all ports in the list
are in an operational down state, the current interface is brought
down. When at least one port has carrier, the current interface
is brought up.
<para>A link name or a list of link names. When set, controls the behavior of the current
link. When all links in the list are in an operational down state, the current link is brought
down. When at least one link has carrier, the current interface is brought up.
</para>
</listitem>
</varlistentry>