New upstream version 1.5.90 upstream/1.5.90

1 files changed, 95 insertions, 144 deletions

diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index 0883692d..abea717e 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -252,7 +252,7 @@ DEVICETYPE=TeamPort
           are NetworkManager specific extensions not understood by traditional initscripts.
         </p>
 <div class="table">
-<a name="id-1.2.8.7.3"></a><p class="title"><b>Table 62. 802-1x setting</b></p>
+<a name="id-1.2.8.7.3"></a><p class="title"><b>Table 65. 802-1x setting</b></p>
 <div class="table-contents"><table class="table" summary="802-1x setting" border="1">
 <colgroup>
 <col>
@@ -527,7 +527,7 @@ Example: </strong></span>IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.4"></a><p class="title"><b>Table 63. bond setting</b></p>
+<a name="id-1.2.8.7.4"></a><p class="title"><b>Table 66. bond setting</b></p>
 <div class="table-contents"><table class="table" summary="bond setting" border="1">
 <colgroup>
 <col>
@@ -552,7 +552,7 @@ Example: </strong></span>BONDING_OPTS="miimon=100 mode=broadcast"</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.5"></a><p class="title"><b>Table 64. bridge-port setting</b></p>
+<a name="id-1.2.8.7.5"></a><p class="title"><b>Table 67. bridge-port setting</b></p>
 <div class="table-contents"><table class="table" summary="bridge-port setting" border="1">
 <colgroup>
 <col>
@@ -593,7 +593,7 @@ Allowed values: </strong></span>1 - 65535</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.6"></a><p class="title"><b>Table 65. bridge setting</b></p>
+<a name="id-1.2.8.7.6"></a><p class="title"><b>Table 68. bridge setting</b></p>
 <div class="table-contents"><table class="table" summary="bridge setting" border="1">
 <colgroup>
 <col>
@@ -673,7 +673,7 @@ Allowed values: </strong></span>0 or 1</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.7"></a><p class="title"><b>Table 66. connection setting</b></p>
+<a name="id-1.2.8.7.7"></a><p class="title"><b>Table 69. connection setting</b></p>
 <div class="table-contents"><table class="table" summary="connection setting" border="1">
 <colgroup>
 <col>
@@ -752,6 +752,17 @@ Example: </strong></span>AUTOCONNECT_PRIORITY=20<span class="bold"><strong>
 Allowed values: </strong></span>-999 to 999</td>
 </tr>
 <tr>
+<td align="left">autoconnect-retries</td>
+<td align="left">AUTOCONNECT_RETRIES<span class="emphasis"><em>(+)</em></span>
+</td>
+<td align="left"> </td>
+<td align="left">The number of times a connection should be autoactivated before giving up and switching to the next one.<span class="bold"><strong>
+
+Example: </strong></span>AUTOCONNECT_RETRIES=1<span class="bold"><strong>
+
+Allowed values: </strong></span>-1 (use global default), 0 (forever) or a positive value</td>
+</tr>
+<tr>
 <td align="left">zone</td>
 <td align="left">ZONE<span class="emphasis"><em>(+)</em></span>
 </td>
@@ -762,15 +773,15 @@ Example: </strong></span>ZONE=Work</td>
 </tr>
 <tr>
 <td align="left">master</td>
-<td align="left">MASTER, TEAM_MASTER, BRIDGE</td>
+<td align="left">MASTER, MASTER_UUID, TEAM_MASTER, TEAM_MASTER_UUID, BRIDGE, BRIDGE_UUID</td>
 <td align="left"> </td>
-<td align="left">Reference to master connection. The variable used depends on the connection type.</td>
+<td align="left">Reference to master connection. The variable used depends on the connection type and the value. In general, if the *_UUID variant is present, the variant without *_UUID is ignored. NetworkManager attempts to write both for compatibility with legacy tooling.</td>
 </tr>
 <tr>
 <td align="left">slave-type</td>
-<td align="left">MASTER, TEAM_MASTER, DEVICETYPE, BRIDGE</td>
+<td align="left">MASTER, MASTER_UUID, TEAM_MASTER, TEAM_MASTER_UUID, DEVICETYPE, BRIDGE, BRIDGE_UUID</td>
 <td align="left"> </td>
-<td align="left">Slave type doesn't map directly to a variable, but it is recognized using different variables.  MASTER for bonding, TEAM_MASTER and DEVICETYPE for teaming, BRIDGE for bridging.</td>
+<td align="left">Slave type doesn't map directly to a variable, but it is recognized using different variables.  MASTER and MASTER_UUID for bonding, TEAM_MASTER, TEAM_MASTER_UUID and DEVICETYPE for teaming, BRIDGE and BRIDGE_UUID for bridging.</td>
 </tr>
 <tr>
 <td align="left">autoconnect-slaves</td>
@@ -797,7 +808,8 @@ Example: </strong></span>GATEWAY_PING_TIMEOUT=5</td>
 </tr>
 <tr>
 <td align="left">metered</td>
-<td align="left">CONNECTION_METERED</td>
+<td align="left">CONNECTION_METERED<span class="emphasis"><em>(+)</em></span>
+</td>
 <td align="left"> </td>
 <td align="left">Whether the device is metered<span class="bold"><strong>
 
@@ -807,7 +819,8 @@ Allowed values: </strong></span>yes,no,unknown</td>
 </tr>
 <tr>
 <td align="left">lldp</td>
-<td align="left">LLDP</td>
+<td align="left">LLDP<span class="emphasis"><em>(+)</em></span>
+</td>
 <td align="left">missing variable means global default</td>
 <td align="left">whether LLDP is enabled for the connection<span class="bold"><strong>
 
@@ -819,7 +832,7 @@ Allowed values: </strong></span>boolean value or 'rx'</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.8"></a><p class="title"><b>Table 67. dcb setting</b></p>
+<a name="id-1.2.8.7.8"></a><p class="title"><b>Table 70. dcb setting</b></p>
 <div class="table-contents"><table class="table" summary="dcb setting" border="1">
 <colgroup>
 <col>
@@ -954,7 +967,7 @@ Example: </strong></span>DCB_PG_UP2TC=01623701</td>
           used explicitly to enable DCB so that the rest of the DCB_* variables can apply.
         </p>
 <div class="table">
-<a name="id-1.2.8.7.10"></a><p class="title"><b>Table 68. infiniband setting</b></p>
+<a name="id-1.2.8.7.10"></a><p class="title"><b>Table 71. infiniband setting</b></p>
 <div class="table-contents"><table class="table" summary="infiniband setting" border="1">
 <colgroup>
 <col>
@@ -973,7 +986,7 @@ Example: </strong></span>DCB_PG_UP2TC=01623701</td>
 <td align="left">mac-address</td>
 <td align="left">HWADDR</td>
 <td align="left"> </td>
-<td align="left">IBoIP 20-byte hardware address of the device (in traditional hex-digits-and-colons notation).<span class="bold"><strong>
+<td align="left">IBoIP 20-byte hardware address of the device (in traditional hex-digits-and-colons notation). Note that for initscripts this is the current MAC address of the device as found during ifup. For NetworkManager this is the permanent MAC address. Or in case no permanent MAC address exists, the MAC address initially configured on the device.<span class="bold"><strong>
 
 Example: </strong></span>HWADDR=01:02:03:04:05:06:07:08:09:0A:01:02:03:04:05:06:07:08:09:11</td>
 </tr>
@@ -1009,25 +1022,7 @@ Example: </strong></span>PHYSDEV=ib0</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.11"></a><p class="title"><b>Table 69. ip-tunnel setting</b></p>
-<div class="table-contents"><table class="table" summary="ip-tunnel 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></tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.8.7.12"></a><p class="title"><b>Table 70. ipv4 setting</b></p>
+<a name="id-1.2.8.7.11"></a><p class="title"><b>Table 72. ipv4 setting</b></p>
 <div class="table-contents"><table class="table" summary="ipv4 setting" border="1">
 <colgroup>
 <col>
@@ -1179,7 +1174,7 @@ Example: </strong></span>DHCP_FQDN=foo.bar.com</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.13"></a><p class="title"><b>Table 71. ipv6 setting</b></p>
+<a name="id-1.2.8.7.12"></a><p class="title"><b>Table 73. ipv6 setting</b></p>
 <div class="table-contents"><table class="table" summary="ipv6 setting" border="1">
 <colgroup>
 <col>
@@ -1316,8 +1311,8 @@ Example: </strong></span>IPV6_TOKEN=::53</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.14"></a><p class="title"><b>Table 72. macvlan setting</b></p>
-<div class="table-contents"><table class="table" summary="macvlan setting" border="1">
+<a name="id-1.2.8.7.13"></a><p class="title"><b>Table 74. macsec setting</b></p>
+<div class="table-contents"><table class="table" summary="macsec setting" border="1">
 <colgroup>
 <col>
 <col>
@@ -1334,8 +1329,8 @@ Example: </strong></span>IPV6_TOKEN=::53</td>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.15"></a><p class="title"><b>Table 73. team-port setting</b></p>
-<div class="table-contents"><table class="table" summary="team-port setting" border="1">
+<a name="id-1.2.8.7.14"></a><p class="title"><b>Table 75. proxy setting</b></p>
+<div class="table-contents"><table class="table" summary="proxy setting" border="1">
 <colgroup>
 <col>
 <col>
@@ -1348,17 +1343,47 @@ Example: </strong></span>IPV6_TOKEN=::53</td>
 <th>Default</th>
 <th>Description</th>
 </tr></thead>
-<tbody><tr>
-<td align="left">config</td>
-<td align="left">TEAM_PORT_CONFIG</td>
+<tbody>
+<tr>
+<td align="left">method</td>
+<td align="left">PROXY_METHOD<span class="emphasis"><em>(+)</em></span>
+</td>
+<td align="left">none</td>
+<td align="left">Method for proxy configuration. For "auto", WPAD is used for proxy configuration, or set the PAC file via PAC_URL or PAC_SCRIPT.<span class="bold"><strong>
+
+Allowed values: </strong></span>none, auto</td>
+</tr>
+<tr>
+<td align="left">browser-only</td>
+<td align="left">BROWSER_ONLY<span class="emphasis"><em>(+)</em></span>
+</td>
+<td align="left">no</td>
+<td align="left">Whether the proxy configuration is for browser only.</td>
+</tr>
+<tr>
+<td align="left">pac-url</td>
+<td align="left">PAC_URL<span class="emphasis"><em>(+)</em></span>
+</td>
 <td align="left"> </td>
-<td align="left">Team port configuration in JSON. See man teamd.conf for details.</td>
-</tr></tbody>
+<td align="left">URL for PAC file.<span class="bold"><strong>
+
+Example: </strong></span>PAC_URL=http://wpad.mycompany.com/wpad.dat</td>
+</tr>
+<tr>
+<td align="left">pac-script</td>
+<td align="left">PAC_SCRIPT<span class="emphasis"><em>(+)</em></span>
+</td>
+<td align="left"> </td>
+<td align="left">Path of the PAC script.<span class="bold"><strong>
+
+Example: </strong></span>PAC_SCRIPT=/home/joe/proxy.pac</td>
+</tr>
+</tbody>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.16"></a><p class="title"><b>Table 74. team setting</b></p>
-<div class="table-contents"><table class="table" summary="team setting" border="1">
+<a name="id-1.2.8.7.15"></a><p class="title"><b>Table 76. team-port setting</b></p>
+<div class="table-contents"><table class="table" summary="team-port setting" border="1">
 <colgroup>
 <col>
 <col>
@@ -1373,33 +1398,15 @@ Example: </strong></span>IPV6_TOKEN=::53</td>
 </tr></thead>
 <tbody><tr>
 <td align="left">config</td>
-<td align="left">TEAM_CONFIG</td>
+<td align="left">TEAM_PORT_CONFIG</td>
 <td align="left"> </td>
-<td align="left">Team configuration in JSON. See man teamd.conf for details.</td>
+<td align="left">Team port configuration in JSON. See man teamd.conf for details.</td>
 </tr></tbody>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.17"></a><p class="title"><b>Table 75. tun setting</b></p>
-<div class="table-contents"><table class="table" summary="tun 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></tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.8.7.18"></a><p class="title"><b>Table 76. vlan setting</b></p>
-<div class="table-contents"><table class="table" summary="vlan setting" border="1">
+<a name="id-1.2.8.7.16"></a><p class="title"><b>Table 77. team setting</b></p>
+<div class="table-contents"><table class="table" summary="team setting" border="1">
 <colgroup>
 <col>
 <col>
@@ -1412,74 +1419,16 @@ Example: </strong></span>IPV6_TOKEN=::53</td>
 <th>Default</th>
 <th>Description</th>
 </tr></thead>
-<tbody>
-<tr>
-<td align="left">parent</td>
-<td align="left">DEVICE or PHYSDEV</td>
-<td align="left"> </td>
-<td align="left">Parent interface of the VLAN.</td>
-</tr>
-<tr>
-<td align="left">id</td>
-<td align="left">VLAN_ID or DEVICE</td>
-<td align="left"> </td>
-<td align="left">VLAN identifier.</td>
-</tr>
-<tr>
-<td align="left">flags</td>
-<td align="left">GVRP, MVRP, VLAN_FLAGS</td>
-<td align="left"> </td>
-<td align="left">VLAN flags.<span class="bold"><strong>
-
-Allowed values: </strong></span>"yes or "no" for GVRP and MVRP; "LOOSE_BINDING" and "NO_REORDER_HDR" for VLAN_FLAGS</td>
-</tr>
-<tr>
-<td align="left">ingress-priority-map</td>
-<td align="left">VLAN_INGRESS_PRIORITY_MAP</td>
-<td align="left"> </td>
-<td align="left">Ingress priority mapping.<span class="bold"><strong>
-
-Example: </strong></span>VLAN_INGRESS_PRIORITY_MAP=4:2,3:5</td>
-</tr>
-<tr>
-<td align="left">egress-priority-map</td>
-<td align="left">VLAN_EGRESS_PRIORITY_MAP</td>
-<td align="left"> </td>
-<td align="left">Egress priority mapping.<span class="bold"><strong>
-
-Example: </strong></span>VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7</td>
-</tr>
-<tr>
-<td align="left">interface-name</td>
-<td align="left">PHYSDEV and VLAN_ID, or DEVICE</td>
+<tbody><tr>
+<td align="left">config</td>
+<td align="left">TEAM_CONFIG</td>
 <td align="left"> </td>
-<td align="left">VLAN interface name. If all variables are set, parent device from PHYSDEV takes precedence over DEVICE, but VLAN id from DEVICE takes precedence over VLAN_ID.<span class="bold"><strong>
-
-Example: </strong></span>PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<br class="table-break"><div class="table">
-<a name="id-1.2.8.7.19"></a><p class="title"><b>Table 77. vxlan setting</b></p>
-<div class="table-contents"><table class="table" summary="vxlan 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></tbody>
+<td align="left">Team configuration in JSON. See man teamd.conf for details.</td>
+</tr></tbody>
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.20"></a><p class="title"><b>Table 78. 802-3-ethernet setting</b></p>
+<a name="id-1.2.8.7.17"></a><p class="title"><b>Table 78. 802-3-ethernet setting</b></p>
 <div class="table-contents"><table class="table" summary="802-3-ethernet setting" border="1">
 <colgroup>
 <col>
@@ -1502,27 +1451,27 @@ Example: </strong></span>PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12</td>
 </tr>
 <tr>
 <td align="left">speed</td>
-<td align="left">(none)</td>
+<td align="left">ETHTOOL_OPTS</td>
 <td align="left"> </td>
-<td align="left">The property is not saved by the plugin.</td>
+<td align="left">Fixed speed for the ethernet link. It is added as "speed" parameter in the ETHTOOL_OPTS variable.</td>
 </tr>
 <tr>
 <td align="left">duplex</td>
-<td align="left">(none)</td>
+<td align="left">ETHTOOL_OPTS</td>
 <td align="left"> </td>
-<td align="left">The property is not saved by the plugin.</td>
+<td align="left">Fixed duplex mode for the ethernet link. It is added as "duplex" parameter in the ETHOOL_OPTS variable.</td>
 </tr>
 <tr>
 <td align="left">auto-negotiate</td>
-<td align="left">(none)</td>
+<td align="left">ETHTOOL_OPTS</td>
 <td align="left"> </td>
-<td align="left">The property is not saved by the plugin.</td>
+<td align="left">Whether link speed and duplex autonegotiation is enabled. It is not saved only if disabled and no values are provided for the "speed" and "duplex" parameters (skips link configuration).</td>
 </tr>
 <tr>
 <td align="left">mac-address</td>
 <td align="left">HWADDR</td>
 <td align="left"> </td>
-<td align="left">Hardware address of the device in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:05).</td>
+<td align="left">Hardware address of the device in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:05). Note that for initscripts this is the current MAC address of the device as found during ifup. For NetworkManager this is the permanent MAC address. Or in case no permanent MAC address exists, the MAC address initially configured on the device.</td>
 </tr>
 <tr>
 <td align="left">cloned-mac-address</td>
@@ -1532,7 +1481,8 @@ Example: </strong></span>PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12</td>
 </tr>
 <tr>
 <td align="left">generate-mac-address-mask</td>
-<td align="left">GENERATE_MAC_ADDRESS_MASK</td>
+<td align="left">GENERATE_MAC_ADDRESS_MASK<span class="emphasis"><em>(+)</em></span>
+</td>
 <td align="left"> </td>
 <td align="left">the MAC address mask for generating randomized and stable cloned-mac-address.</td>
 </tr>
@@ -1579,7 +1529,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.8.7.21"></a><p class="title"><b>Table 79. 802-11-wireless-security setting</b></p>
+<a name="id-1.2.8.7.18"></a><p class="title"><b>Table 79. 802-11-wireless-security setting</b></p>
 <div class="table-contents"><table class="table" summary="802-11-wireless-security setting" border="1">
 <colgroup>
 <col>
@@ -1731,7 +1681,7 @@ Example: </strong></span>KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysuperse
 </table></div>
 </div>
 <br class="table-break"><div class="table">
-<a name="id-1.2.8.7.22"></a><p class="title"><b>Table 80. 802-11-wireless setting</b></p>
+<a name="id-1.2.8.7.19"></a><p class="title"><b>Table 80. 802-11-wireless setting</b></p>
 <div class="table-contents"><table class="table" summary="802-11-wireless setting" border="1">
 <colgroup>
 <col>
@@ -1806,7 +1756,7 @@ Example: </strong></span>BSSID=00:1E:BD:64:83:21</td>
 <td align="left">mac-address</td>
 <td align="left">HWADDR</td>
 <td align="left"> </td>
-<td align="left">Hardware address of the device in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:05).</td>
+<td align="left">Hardware address of the device in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:05). Note that for initscripts this is the current MAC address of the device as found during ifup. For NetworkManager this is the permanent MAC address. Or in case no permanent MAC address exists, the MAC address initially configured on the device.</td>
 </tr>
 <tr>
 <td align="left">cloned-mac-address</td>
@@ -1816,7 +1766,8 @@ Example: </strong></span>BSSID=00:1E:BD:64:83:21</td>
 </tr>
 <tr>
 <td align="left">generate-mac-address-mask</td>
-<td align="left">GENERATE_MAC_ADDRESS_MASK</td>
+<td align="left">GENERATE_MAC_ADDRESS_MASK<span class="emphasis"><em>(+)</em></span>
+</td>
 <td align="left"> </td>
 <td align="left">the MAC address mask for generating randomized and stable cloned-mac-address.</td>
 </tr>
@@ -1878,7 +1829,7 @@ Allowed values: </strong></span>default, never, always</td>
 </table></div>
 </div>
 <br class="table-break"><p>The following settings are not supported by <span class="emphasis"><em>ifcfg-rh</em></span> plugin:</p>
-<p>adsl, bluetooth, ppp, pppoe, serial, generic, gsm, cdma, 802-11-olpc-mesh, wimax, vpn</p>
+<p>adsl, bluetooth, ppp, pppoe, serial, generic, gsm, cdma, 802-11-olpc-mesh, wimax, vpn, macvlan, vxlan, tun, ip-tunnel</p>
 <div class="refsect2">
 <a name="secrets-flags"></a><h3>Secret flags</h3>
 <p>