about summary refs log tree commit diff
path: root/docs/api/html/nm-settings-ifcfg-rh.html
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2020-02-26 16:25:55 +0100
committerSebastien Bacher <seb128@ubuntu.com>2020-02-26 16:25:55 +0100
commitee7b95167028fdbb2a4bd32aa686e27817d8dfe0 (patch)
treef7a1abab0400789979f860dda724247a9bbbdef1 /docs/api/html/nm-settings-ifcfg-rh.html
parentc1b3616485604f3fddfad9521cb8818cd8eece2b (diff)
parente536d40eaea5dcdc0743b0a5e8e17faa46608a50 (diff)
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'docs/api/html/nm-settings-ifcfg-rh.html')
-rw-r--r--docs/api/html/nm-settings-ifcfg-rh.html18
1 files changed, 18 insertions, 0 deletions
diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index 8921a324..8bc1a6f5 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -1411,6 +1411,15 @@ Example: </strong></span>IPV6_DEFAULTGW=abbe::1</td>
 <td align="left">Hostname to send the DHCP server.</td>
 </tr>
 <tr>
+<td align="left">dhcp-timeout</td>
+<td align="left">IPV6_DHCP_TIMEOUT<span class="emphasis"><em>(+)</em></span>
+</td>
+<td align="left"> </td>
+<td align="left">A timeout after which the DHCP transaction fails in case of no response.<span class="bold"><strong>
+
+Example: </strong></span>IPV6_DHCP_TIMEOUT=10</td>
+</tr>
+<tr>
 <td align="left">never-default</td>
 <td align="left">IPV6_DEFROUTE<span class="emphasis"><em>(+)</em></span>, (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network)</td>
 <td align="left">IPV6_DEFROUTE=yes (when no variable specified)</td>
@@ -1487,6 +1496,15 @@ Allowed values: </strong></span>IPV6_ADDR_GEN_MODE: eui64, stable-privacy</td>
 Example: </strong></span>IPV6_TOKEN=::53</td>
 </tr>
 <tr>
+<td align="left">dhcp-timeout</td>
+<td align="left">IPV6_RA_TIMEOUT<span class="emphasis"><em>(+)</em></span>
+</td>
+<td align="left"> </td>
+<td align="left">A timeout for waiting Router Advertisements in seconds.<span class="bold"><strong>
+
+Example: </strong></span>IPV6_RA_TIMEOUT=10</td>
+</tr>
+<tr>
 <td align="left">dhcp-duid</td>
 <td align="left">DHCPV6_DUID<span class="emphasis"><em>(+)</em></span>
 </td>