From: Umut Tezduyar Lindskog <umut.tezduyar@axis.com>
Date: Wed, 5 Mar 2014 19:51:36 +0000 (+0100)
Subject: man: ipv4 link-local
X-Git-Tag: v211~108
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=848e3e24b00a61130f20226ef5f051433d478c69

man: ipv4 link-local
---

diff --git a/TODO b/TODO
index fd75eab4a..dbfe48eff 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 fcf48c6d4..4118fc9b6 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -188,6 +188,15 @@
                                                 <para>A boolean. When true, enables basic DHCPv4 support.</para>
                                         </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>