From ba17915457271cc13d46cbafc876277d037acd67 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Fri, 25 Jul 2014 01:13:47 +0200
Subject: networkd: ipv4ll - configure link-local address independently of
 DHCPv4

This changes the behavior when both DHCPv4 and IPv4LL are enabled. Before,
we would disable IPv4LL when we got a DHCPv4 lease and enable it if the
lease was lost.

Now we just always set up both, if both are enabled, but the DHCPv4
addresses and routes will always take precedence due to their metric
and scope.
---
 man/systemd.network.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'man')

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index dc34154b26..34eca012b6 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -212,9 +212,6 @@
                                         <term><varname>IPv4LL=</varname></term>
                                         <listitem>
                                                 <para>A boolean. When true, enables IPv4 link-local support.
-                                                If <literal>DHCP=</literal> is also true, acquiring DHCP address
-                                                will deprecate previously acquired IPv4 link-local address or
-                                                stop acquiring process if one has not been acquired before.
                                                 </para>
                                         </listitem>
                                 </varlistentry>
-- 
cgit v1.2.3-54-g00ecf