Blame SOURCES/network-docs-pr36.diff

0ecfb5
diff --git a/README.md b/README.md
0ecfb5
index 9d66088..2612c46 100644
0ecfb5
--- a/README.md
0ecfb5
+++ b/README.md
0ecfb5
@@ -113,6 +113,7 @@ variable.
0ecfb5
 Valid values for `type` are:
0ecfb5
 
0ecfb5
   - `ethernet`
0ecfb5
+  - `infiniband`
0ecfb5
   - `bridge`
0ecfb5
   - `bond`
0ecfb5
   - `team`
0ecfb5
@@ -142,7 +143,7 @@ to match a non-virtual device with the profile.
0ecfb5
 
0ecfb5
 - For NetworkManager `mac` is the permanent MAC address `ethernet.mac-address`.
0ecfb5
 
0ecfb5
-- For initscripts, this means the currently configurd MAC address of the device (`HWADDR`).
0ecfb5
+- For initscripts, this means the currently configured MAC address of the device (`HWADDR`).
0ecfb5
 
0ecfb5
 ### `interface_name`
0ecfb5
 
0ecfb5
@@ -252,6 +253,13 @@ network_connections:
0ecfb5
       #dhcp4_send_hostname: no
0ecfb5
       gateway4: 192.0.2.1
0ecfb5
 
0ecfb5
+      dns:
0ecfb5
+        - 192.0.2.2
0ecfb5
+        - 198.51.100.5
0ecfb5
+      dns_search:
0ecfb5
+        - example.com
0ecfb5
+        - subdomain.example.com
0ecfb5
+
0ecfb5
       route_metric6: -1
0ecfb5
       auto6: no
0ecfb5
       gateway6: 2001:db8::1
0ecfb5
@@ -260,6 +268,18 @@ network_connections:
0ecfb5
         - 192.0.2.3/24
0ecfb5
         - 198.51.100.3/26
0ecfb5
         - 2001:db8::80/7
0ecfb5
+
0ecfb5
+      route:
0ecfb5
+        - network: 198.51.100.128
0ecfb5
+          prefix: 26
0ecfb5
+          gateway: 198.51.100.1
0ecfb5
+          metric: 2
0ecfb5
+        - network: 198.51.100.64
0ecfb5
+          prefix: 26
0ecfb5
+          gateway: 198.51.100.6
0ecfb5
+          metric: 4
0ecfb5
+      route_append_only: no
0ecfb5
+      rule_append_only: yes
0ecfb5
 ```
0ecfb5
 
0ecfb5
 Manual addressing can be specified via a list of addresses and prefixes `address`.
0ecfb5
@@ -273,14 +293,50 @@ Note that `dhcp4_send_hostname` is only supported by the `nm` provider and trans
0ecfb5
 to [`ipv4.dhcp-send-hostname`](https://developer.gnome.org/NetworkManager/stable/nm-settings.html#nm-settings.property.ipv4.dhcp-send-hostname)
0ecfb5
 property.
0ecfb5
 
0ecfb5
+Manual DNS configuration can be specified via a list of addresses
0ecfb5
+given in the `dns` option and a list of domains to search given in the
0ecfb5
+`dns_search` option.
0ecfb5
+
0ecfb5
 - For NetworkManager, `route_metric4` and `route_metric6` corresponds to the
0ecfb5
 [`ipv4.route-metric`](https://developer.gnome.org/NetworkManager/stable/nm-settings.html#nm-settings.property.ipv4.route-metric) and
0ecfb5
 [`ipv6.route-metric`](https://developer.gnome.org/NetworkManager/stable/nm-settings.html#nm-settings.property.ipv6.route-metric)
0ecfb5
  properties, respectively. If specified, it determines the route metric
0ecfb5
 for DHCP assigned routes and the default route, and thus the priority for multiple interfaces.
0ecfb5
 
0ecfb5
+Static route configuration can be specified via a list of routes given in the `route`
0ecfb5
+option. The default value is an empty list. Each route is a dictionary with the following
0ecfb5
+entries: `network`, `prefix`, `gateway` and `metric`. `network` and `prefix` together specify
0ecfb5
+the destination network. CIDR notation or network mask notation are not supported yet. If the
0ecfb5
+boolean option `route_append_only` is `yes`, the specified routes are appended to the
0ecfb5
+existing routes, if it is `no` (default), the current routes are replaced. Setting this
0ecfb5
+option to `yes` without setting `route` has the effect of preserving the current static routes. The
0ecfb5
+boolean option `rule_append_only` works in a similar way for routing rules. Note that there is
0ecfb5
+no further support for routing rules at the moment, so this option serves merely the purpose
0ecfb5
+of preserving the current routing rules.  Note also that when
0ecfb5
+`route_append_only`/`rule_append_only` is not specified, the current routes/routing rules will
0ecfb5
+be deleted by the role.
0ecfb5
+
0ecfb5
 Slaves to bridge/bond/team devices cannot specify `ip` settings.
0ecfb5
 
0ecfb5
+### `type: ethernet`
0ecfb5
+
0ecfb5
+Ethernet-specific options can be set using the connection profile variable `ethernet`. This
0ecfb5
+variable should be specified as a dictionary with the following items (options): `autoneg`, `speed` and `duplex`,
0ecfb5
+which correspond to the settings of the `ethtool` utility with the same name. `speed` is an
0ecfb5
+integer giving the speed in Mb/s, the valid values of `duplex` are `half` and `full`, and
0ecfb5
+`autoneg` accepts a boolean value (default is `yes`) to configure autonegotiation. The `speed` and `duplex` settings are required when autonegotiation is disabled.
0ecfb5
+
0ecfb5
+```yaml
0ecfb5
+network_connections:
0ecfb5
+  - name: "eth0"
0ecfb5
+    type: "ethernet"
0ecfb5
+
0ecfb5
+    ethernet:
0ecfb5
+      autoneg: no
0ecfb5
+      speed: 1000
0ecfb5
+      duplex: full
0ecfb5
+```
0ecfb5
+
0ecfb5
 ### Virtual types and Slaves
0ecfb5
 
0ecfb5
 Device types like `bridge`, `bond`, `team` work similar: