summaryrefslogtreecommitdiff
path: root/man/NetworkManager.conf.xml
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-09-11 10:43:48 +0200
committerThomas Haller <thaller@redhat.com>2017-09-11 15:05:57 +0200
commit1aa36dde94dfb32a7172815ecb918b662aa9253b (patch)
treec9f45271a22d2591297a7eac8a5f2e9ec8a811f8 /man/NetworkManager.conf.xml
parentfa46736013fa1e3df1508b1f67b495ce45daf94a (diff)
downloadNetworkManager-1aa36dde94dfb32a7172815ecb918b662aa9253b.tar.gz
device: enable support for ipv6.dhcp-timeout
- cleanup data type and use guint32 consistently. We might want to introduce a new "infinity" value. But since libnm's NM_SETTING_IP_CONFIG_DHCP_TIMEOUT asserts against the range 0 - G_MAXINT32, we cannot express it as -1 anyway. So, infinity will have the numerical value G_MAXINT32, hence guint32 is just fine. - make use of existing ipv6.dhcp-timeout setting and add global default configuration in NetworkManager.conf - instead of having subclasses call nm_device_set_dhcp_timeout(), add a virtual function get_dhcp_timeout().
Diffstat (limited to 'man/NetworkManager.conf.xml')
-rw-r--r--man/NetworkManager.conf.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index d8fa1b3b95..25fe1ba4d4 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -683,6 +683,11 @@ ipv6.ip6-privacy=0
<term><varname>ipv4.route-metric</varname></term>
</varlistentry>
<varlistentry>
+ <term><varname>ipv6.dhcp-timeout</varname></term>
+ <listitem><para>If left unspecified, the default value for
+ the interface type is used.</para></listitem>
+ </varlistentry>
+ <varlistentry>
<term><varname>ipv6.ip6-privacy</varname></term>
<listitem><para>If <literal>ipv6.ip6-privacy</literal> is unset, use the content of
"/proc/sys/net/ipv6/conf/default/use_tempaddr" as last fallback.