summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-11-11 16:03:05 +0100
committerDaniel Mack <github@zonque.org>2015-11-11 16:03:05 +0100
commit3116c225d2e3c0d8e6b3f4d4a9b48443cc7baf2d (patch)
treedefe1a2bab15d776e52b8ba3d5a1c8744c0ef7bf /man
parenta2e6fbf5c047314db036000203b42c6aac1e3511 (diff)
parent4058d339f5b290ec970e1de0d3b804e4934acc20 (diff)
Merge pull request #1843 from teg/ndisc
ndisc and dhcpv6
Diffstat (limited to 'man')
-rw-r--r--man/systemd.network.xml12
1 files changed, 11 insertions, 1 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 7d081d22fe..5994869d97 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -227,7 +227,14 @@
<literal>yes</literal>, <literal>no</literal>,
<literal>ipv4</literal>, or <literal>ipv6</literal>.</para>
- <para>Please note that, by default, the domain name
+ <para>Note that DHCPv6 will by default be triggered by Router
+ Advertisment, if that is enabled, regardless of this parameter.
+ By enabling DHCPv6 support explicitly, the DHCPv6 client will
+ be started regardless of the presence of routers on the link,
+ or what flags the routers pass. See
+ <literal>IPv6AcceptRouterAdvertisements=</literal>.</para>
+
+ <para>Furthermore, note that by default the domain name
specified through DHCP is not used for name resolution.
See option <option>UseDomains=</option> below.</para>
</listitem>
@@ -414,6 +421,9 @@
When unset, the kernel default is used, and router
advertisements are accepted only when local forwarding
is disabled for that interface.
+ When router advertisements are accepted, they will
+ trigger the start of the DHCPv6 client if the relevant
+ flags are passed, or if no routers are found on the link.
Takes a boolean. If true, router advertisements are
accepted, when false, router advertisements are ignored,
independently of the local forwarding state.</para>