summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-07-25 01:13:47 +0200
committerTom Gundersen <teg@jklm.no>2014-07-30 17:45:47 +0200
commitba17915457271cc13d46cbafc876277d037acd67 (patch)
treea76a38fc688195537fa226ebd9950da099226f09 /man
parent3f77a1b19f5a8ce33566f7f6e28e94c08ea30841 (diff)
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.
Diffstat (limited to 'man')
-rw-r--r--man/systemd.network.xml3
1 files changed, 0 insertions, 3 deletions
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>