summary refs log tree commit diff
path: root/docs/api/html/nm-settings-ifcfg-rh.html
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2017-12-12 15:53:07 +0100
committerMichael Biebl <biebl@debian.org>2017-12-12 15:53:07 +0100
commitafcd268ea7b1149fbfb66bce4eca659b675da0a2 (patch)
treec3fca2203ad17434daf3ccf576582bd66aa41ab2 /docs/api/html/nm-settings-ifcfg-rh.html
parent417f6015c3dc8c47cf27daa59f64e0e36c521b9c (diff)
New upstream version 1.10.2 upstream/1.10.2
Diffstat (limited to 'docs/api/html/nm-settings-ifcfg-rh.html')
-rw-r--r--docs/api/html/nm-settings-ifcfg-rh.html81
1 files changed, 67 insertions, 14 deletions
diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index 8c6484d7..093b8ff4 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -8,7 +8,7 @@
 <link rel="up" href="manpages.html" title="Part I. Manual Pages">
 <link rel="prev" href="nm-settings-keyfile.html" title="nm-settings-keyfile">
 <link rel="next" href="nm-online.html" title="nm-online">
-<meta name="generator" content="GTK-Doc V1.25 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.26 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -631,10 +631,10 @@ Allowed values: </strong></span>1 - 65535</td>
 <tbody>
 <tr>
 <td align="left">mac-address</td>
-<td align="left">MACADDR<span class="emphasis"><em>(+)</em></span>
+<td align="left">BRIDGE_MACADDR<span class="emphasis"><em>(+)</em></span>
 </td>
 <td align="left"> </td>
-<td align="left">MAC address of the bridge. Note that this requires a recent kernel support, originally introduced in 3.15 upstream kernel) MACADDR for bridges is an NM extension.</td>
+<td align="left">MAC address of the bridge. Note that this requires a recent kernel support, originally introduced in 3.15 upstream kernel) BRIDGE_MACADDR for bridges is an NM extension.</td>
 </tr>
 <tr>
 <td align="left">stp</td>
@@ -1163,6 +1163,15 @@ Example: </strong></span>GATEWAY=10.5.5.1</td>
 <td align="left">IPV4_ROUTE_TABLE enables policy-routing and sets the default routing table.</td>
 </tr>
 <tr>
+<td align="left">dns-options</td>
+<td align="left">RES_OPTIONS<span class="emphasis"><em>(+)</em></span>
+</td>
+<td align="left"> </td>
+<td align="left">List of DNS options to be added to /etc/resolv.conf<span class="bold"><strong>
+
+Example: </strong></span>RES_OPTIONS=ndots:2 timeout:3</td>
+</tr>
+<tr>
 <td align="left">dns-priority</td>
 <td align="left">IPV4_DNS_PRIORITY<span class="emphasis"><em>(+)</em></span>
 </td>
@@ -1238,7 +1247,7 @@ Example: </strong></span>DHCP_FQDN=foo.bar.com</td>
 </tr>
 <tr>
 <td align="left">dns-search</td>
-<td align="left">DOMAIN</td>
+<td align="left">IPV6_DOMAIN</td>
 <td align="left"> </td>
 <td align="left">List of DNS search domains.</td>
 </tr>
@@ -1321,6 +1330,15 @@ Example: </strong></span>IPV6_DEFAULTGW=abbe::1</td>
 Example: </strong></span>IPV6_DNS_PRIORITY=20</td>
 </tr>
 <tr>
+<td align="left">dns-options</td>
+<td align="left">IPV6_RES_OPTIONS<span class="emphasis"><em>(+)</em></span>
+</td>
+<td align="left"> </td>
+<td align="left">List of DNS options to be added to /etc/resolv.conf<span class="bold"><strong>
+
+Example: </strong></span>IPV6_RES_OPTIONS=ndots:2 timeout:3</td>
+</tr>
+<tr>
 <td align="left">ip6-privacy</td>
 <td align="left">IPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP<span class="emphasis"><em>(+)</em></span>
 </td>
@@ -1478,7 +1496,42 @@ Example: </strong></span>PAC_SCRIPT=/home/joe/proxy.pac</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.9.7.18"></a><p class="title"><b>Table 48. team-port setting</b></p>
+<a name="id-1.2.9.7.18"></a><p class="title"><b>Table 48. tc setting</b></p>
+<div class="table-contents"><table class="table" summary="tc setting" border="1">
+<colgroup>
+<col>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>Property</th>
+<th>Ifcfg-rh Variable</th>
+<th>Default</th>
+<th>Description</th>
+</tr></thead>
+<tbody>
+<tr>
+<td align="left">qdiscs</td>
+<td align="left">QDISC1, QDISC2, ...</td>
+<td align="left"> </td>
+<td align="left">Queueing disciplines<span class="bold"><strong>
+
+Example: </strong></span>QDISC1=ingress, QDISC2="root handle 1234: fq_codel"</td>
+</tr>
+<tr>
+<td align="left">qdiscs</td>
+<td align="left">FILTER1, FILTER2, ...</td>
+<td align="left"> </td>
+<td align="left">Traffic filters<span class="bold"><strong>
+
+Example: </strong></span>FILTER1="parent ffff: matchall action simple sdata Input", ...</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<br class="table-break"><div class="table">
+<a name="id-1.2.9.7.19"></a><p class="title"><b>Table 49. team-port setting</b></p>
 <div class="table-contents"><table class="table" summary="team-port setting" border="1">
 <colgroup>
 <col>
@@ -1501,7 +1554,7 @@ Example: </strong></span>PAC_SCRIPT=/home/joe/proxy.pac</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.9.7.19"></a><p class="title"><b>Table 49. team setting</b></p>
+<a name="id-1.2.9.7.20"></a><p class="title"><b>Table 50. team setting</b></p>
 <div class="table-contents"><table class="table" summary="team setting" border="1">
 <colgroup>
 <col>
@@ -1524,7 +1577,7 @@ Example: </strong></span>PAC_SCRIPT=/home/joe/proxy.pac</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.9.7.20"></a><p class="title"><b>Table 50. user setting</b></p>
+<a name="id-1.2.9.7.21"></a><p class="title"><b>Table 51. user setting</b></p>
 <div class="table-contents"><table class="table" summary="user setting" border="1">
 <colgroup>
 <col>
@@ -1549,7 +1602,7 @@ Example: </strong></span>NM_USER_FOO__BAR=something</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.9.7.21"></a><p class="title"><b>Table 51. vlan setting</b></p>
+<a name="id-1.2.9.7.22"></a><p class="title"><b>Table 52. vlan setting</b></p>
 <div class="table-contents"><table class="table" summary="vlan setting" border="1">
 <colgroup>
 <col>
@@ -1612,7 +1665,7 @@ Example: </strong></span>PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.9.7.22"></a><p class="title"><b>Table 52. 802-3-ethernet setting</b></p>
+<a name="id-1.2.9.7.23"></a><p class="title"><b>Table 53. 802-3-ethernet setting</b></p>
 <div class="table-contents"><table class="table" summary="802-3-ethernet setting" border="1">
 <colgroup>
 <col>
@@ -1713,7 +1766,7 @@ Allowed values: </strong></span>"qeth", "lcs" or "ctc"</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.9.7.23"></a><p class="title"><b>Table 53. 802-11-wireless-security setting</b></p>
+<a name="id-1.2.9.7.24"></a><p class="title"><b>Table 54. 802-11-wireless-security setting</b></p>
 <div class="table-contents"><table class="table" summary="802-11-wireless-security setting" border="1">
 <colgroup>
 <col>
@@ -1865,10 +1918,10 @@ Example: </strong></span>WPA_PSK_FLAGS=user</td>
 </tr>
 <tr>
 <td align="left">wep-key-type</td>
-<td align="left">KEY&lt;i&gt; or KEY_PASSPHRASE&lt;i&gt;<span class="emphasis"><em>(+)</em></span>
+<td align="left">KEY&lt;i&gt; or KEY_PASSPHRASE&lt;i&gt;<span class="emphasis"><em>(+)</em></span>; KEY_TYPE<span class="emphasis"><em>(+)</em></span>
 </td>
 <td align="left"> </td>
-<td align="left">KEY is used for "key" type (10 or 26 hexadecimal characters, or 5 or 13 character string prefixed with "s:"). KEY_PASSPHRASE is used for WEP passphrases.<span class="bold"><strong>
+<td align="left">KEY is used for "key" type (10 or 26 hexadecimal characters, or 5 or 13 character string prefixed with "s:"). KEY_PASSPHRASE is used for WEP passphrases. KEY_TYPE specifies the key type and can be either 'key' or 'passphrase'. KEY_TYPE is redundant and can be omitted.<span class="bold"><strong>
 
 Example: </strong></span>KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkey</td>
 </tr>
@@ -1884,7 +1937,7 @@ Example: </strong></span>WPS_METHOD=disabled, WPS_METHOD="pin pbc"</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.9.7.24"></a><p class="title"><b>Table 54. 802-11-wireless setting</b></p>
+<a name="id-1.2.9.7.25"></a><p class="title"><b>Table 55. 802-11-wireless setting</b></p>
 <div class="table-contents"><table class="table" summary="802-11-wireless setting" border="1">
 <colgroup>
 <col>
@@ -2073,6 +2126,6 @@ Allowed values: </strong></span>default, never, always</td>
 </div>
 </div>
 <div class="footer">
-<hr>Generated by GTK-Doc V1.25</div>
+<hr>Generated by GTK-Doc V1.26</div>
 </body>
 </html>
\ No newline at end of file