summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUmut Tezduyar Lindskog <umut.tezduyar@axis.com>2014-03-05 20:51:36 +0100
committerTom Gundersen <teg@jklm.no>2014-03-05 21:46:31 +0100
commit848e3e24b00a61130f20226ef5f051433d478c69 (patch)
tree1e6292296f6338863da54d4f971705af80a08acc
parent7040b626e82d65dc48a4e464965e15ec7f529aec (diff)
man: ipv4 link-local
-rw-r--r--TODO1
-rw-r--r--man/systemd.network.xml9
2 files changed, 9 insertions, 1 deletions
diff --git a/TODO b/TODO
index fd75eab4a1..dbfe48eff9 100644
--- a/TODO
+++ b/TODO
@@ -670,7 +670,6 @@ Features:
- add proper initrd support (in particular generate .network/.link files based on /proc/cmdline)
- add reduced [Link] support to .network files
- add IPv4LL tests (inspire by DHCP)
- - add IPv4LL to man pages. Explain coexistance between DHCP
- add Scope= parsing option for [Network]
- change LL address generation and make it predictable like get_mac() (link-config.c)
- have smooth transition from LL to routable address, without disconnecting clients.
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index fcf48c6d46..4118fc9b65 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -189,6 +189,15 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><varname>IPv4LL=</varname></term>
+ <listitem>
+ <para>A boolean. When true, enables IPv4 link-local support.
+ If <literal>DHCP=</literal> is also true, IPv4 link-local
+ address will be removed upon acquiring a DHCP lease.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><varname>Address=</varname></term>
<listitem>
<para>A static IPv4 or IPv6 address and its prefix length,