From 58f8be580039b0575b197b9573a1c92745d96d30 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 17 Jan 2017 20:25:09 +0100 Subject: New upstream version 1.5.90 --- docs/api/html/NetworkManager.conf.html | 88 +++++++++++++++++++++++++++------- 1 file changed, 70 insertions(+), 18 deletions(-) (limited to 'docs/api/html/NetworkManager.conf.html') diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index ffaa8612..70f10154 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -32,6 +32,7 @@

Synopsis

/etc/NetworkManager/NetworkManager.conf, /etc/NetworkManager/conf.d/name.conf, + /run/NetworkManager/conf.d/name.conf, /usr/lib/NetworkManager/conf.d/name.conf, /var/lib/NetworkManager/NetworkManager-intern.conf

@@ -53,10 +54,13 @@ These will be read in order, with later files overriding earlier ones. Packages might install further configuration snippets to /usr/lib/NetworkManager/conf.d. This directory is parsed first, even before NetworkManager.conf. - The loading of a file /usr/lib/NetworkManager/conf.d/name.conf + Scripts can also put per-boot configuration into /run/NetworkManager/conf.d. + This directory is parsed second, also before NetworkManager.conf. + The loading of a file /run/NetworkManager/conf.d/name.conf can be prevented by adding a file /etc/NetworkManager/conf.d/name.conf. - In this case, the file from the etc configuration shadows the file from the - system configuration directory. + Likewise, a file /usr/lib/NetworkManager/conf.d/name.conf + can be shadowed by putting a file of the same name to either /etc/NetworkManager/conf.d + or /run/NetworkManager/conf.d.

NetworkManager can overwrite certain user configuration options via D-Bus or other internal @@ -179,9 +183,9 @@ plugins-=remove-me clients to be installed. The internal option uses a built-in DHCP client which is not currently as featureful as the external clients.

-

If this key is missing, available DHCP clients are - looked for in this order: dhclient, - dhcpcd, +

If this key is missing, it defaults to dhclient. + It the chosen plugin is not available, clients are looked for + in this order: dhclient, dhcpcd, internal.

@@ -199,7 +203,7 @@ plugins-=remove-me

When the default wired connection is deleted or saved to a new persistent connection by a plugin, the device is added to a list in the file - /var/run/NetworkManager/no-auto-default.state + /run/NetworkManager/no-auto-default.state to prevent creating the default connection for that device again.

See the section called “Device List Format” for the syntax how to @@ -222,7 +226,7 @@ no-auto-default=*

This setting is deprecated for the per-device setting ignore-carrier which overwrites this setting - if specified (See ???). + if specified (See ignore-carrier). Otherwise, it is a list of matches to specify for which device carrier should be ignored. See the section called “Device List Format” for the syntax how to specify a device. @@ -265,20 +269,36 @@ no-auto-default=*

dns

-

Set the DNS (resolv.conf) processing mode.

-

default: The default if the key is - not specified. NetworkManager will update - resolv.conf to reflect the nameservers +

Set the DNS (resolv.conf) processing mode. + If the key is unspecified, default is used, + unless /etc/resolv.conf is a symlink to + /run/systemd/resolve/resolv.conf, + /lib/systemd/resolv.conf or + /usr/lib/systemd/resolv.conf. + In that case, systemd-resolved is chosen automatically. +

+

default: NetworkManager will update + /etc/resolv.conf to reflect the nameservers provided by currently active connections.

dnsmasq: NetworkManager will run dnsmasq as a local caching nameserver, using a "split DNS" configuration if you are connected to a VPN, and then update resolv.conf to point to the local - nameserver.

+ nameserver. It is possible to pass custom options to the + dnsmasq instance by adding them to files in the + "${prefix}/etc/NetworkManager/dnsmasq.d/" + directory. Note that when multiple upstream servers are + available, dnsmasq will initially contact them in parallel and + then use the fastest to respond, probing again other servers + after some time. This behavior can be modified passing the + 'all-servers' or 'strict-order' options to dnsmasq (see the + manual page for more details).

unbound: NetworkManager will talk to unbound and dnssec-triggerd, providing a "split DNS" - configuration with DNSSEC support. The /etc/resolv.conf + configuration with DNSSEC support. /etc/resolv.conf will be managed by dnssec-trigger daemon.

+

systemd-resolved: NetworkManager will + push the DNS configuration to systemd-resolved

none: NetworkManager will not modify resolv.conf. This implies rc-manager unmanaged

@@ -334,6 +354,18 @@ no-auto-default=*

+ +

autoconnect-retries-default

+

+ The number of times a connection activation should be + automatically tried before switching to another one. This + value applies only to connections that can auto-connect + and have a + connection.autoconnect-retries property + set to -1. If not specified, connections will be retried 4 + times. +

+ @@ -361,7 +393,7 @@ no-auto-default=*

path

The location where keyfiles are read and stored. - This defaults to "/etc/NetworkManager/conf.d". + This defaults to "${prefix}/etc/NetworkManager/conf.d".

@@ -534,18 +566,34 @@ ipv6.ip6-privacy=0 +

connection.stable-id

+ + +

ethernet.cloned-mac-address

-

If left unspecified, it defaults to "permanent".

+

If left unspecified, it defaults to "preserve".

ethernet.generate-mac-address-mask

+

ethernet.mtu

+

If configured explicitly to 0, the MTU is not reconfigured during device activation unless it is required due to IPv6 constraints. If left unspecified, a DHCP/IPv6 SLAAC provided value is used or a default of 1500.

+ +

ethernet.wake-on-lan

+

infiniband.mtu

+

If configured explicitly to 0, the MTU is not reconfigured during device activation unless it is required due to IPv6 constraints. If left unspecified, a DHCP/IPv6 SLAAC provided value is used or the MTU is left unspecified on activation.

+ + +

ip-tunnel.mtu

+

If configured explicitly to 0, the MTU is not reconfigured during device activation unless it is required due to IPv6 constraints. If left unspecified, a DHCP/IPv6 SLAAC provided value is used or a default of 1500.

+ +

ipv4.dad-timeout

@@ -574,7 +622,7 @@ ipv6.ip6-privacy=0

wifi.cloned-mac-address

-

If left unspecified, it defaults to "permanent".

+

If left unspecified, it defaults to "preserve".

wifi.generate-mac-address-mask

@@ -587,6 +635,10 @@ ipv6.ip6-privacy=0

+

wifi.mtu

+

If configured explicitly to 0, the MTU is not reconfigured during device activation unless it is required due to IPv6 constraints. If left unspecified, a DHCP/IPv6 SLAAC provided value is used or a default of 1500.

+ +

wifi.powersave

If left unspecified, the default value "ignore" will be used.

@@ -772,7 +824,7 @@ unmanaged=1 That is, multiple sections that all start with the prefix "device" can be specified. The settings "match-device" and "stop-match" are available to match a device section on a device. The order of multiple sections is also top-down within the file and - later files overwrite previous settings. See the section called “Sections” + later files overwrite previous settings. See “Sections” under the section called “CONNECTION SECTION” for details.

-- cgit 1.3.0-6-gf8a5