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 --- man/NetworkManager.conf.xml | 94 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 20 deletions(-) (limited to 'man/NetworkManager.conf.xml') diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 6295b821..8c93ac4c 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -45,6 +45,7 @@ /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 @@ -67,10 +68,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 @@ -172,7 +176,7 @@ plugins-=remove-me Whether the system uses PolicyKit for authorization. If false, all requests will be allowed. If true, non-root requests are authorized using PolicyKit. - The default value is &NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT;. + The default value is &NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT;. @@ -185,9 +189,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 &NM_CONFIG_DEFAULT_MAIN_DHCP;. + It the chosen plugin is not available, clients are looked for + in this order: dhclient, dhcpcd, internal. @@ -203,7 +207,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 for the syntax how to @@ -226,7 +230,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 ). Otherwise, it is a list of matches to specify for which device carrier should be ignored. See for the syntax how to specify a device. @@ -274,20 +278,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 + "&sysconfdir;/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 @@ -299,7 +319,7 @@ no-auto-default=* Set the resolv.conf management mode. The default value depends on NetworkManager build options, and this version of NetworkManager was build with a default of - "&NM_CONFIG_DEFAULT_DNS_RC_MANAGER;". + "&NM_CONFIG_DEFAULT_MAIN_RC_MANAGER;". Regardless of this setting, NetworkManager will always write resolv.conf to its runtime state directory. symlink: NetworkManager will symlink @@ -344,6 +364,21 @@ 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. + + + + @@ -523,7 +558,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth "debug" uses syslog and logs to standard error. If NetworkManager is started in debug mode (--debug) this option is ignored and "debug" is always used. - Otherwise, the default is "&NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT;". + Otherwise, the default is "&NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT;". @@ -565,16 +600,31 @@ ipv6.ip6-privacy=0 connection.lldp + + 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 @@ -601,7 +651,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 @@ -612,6 +662,10 @@ ipv6.ip6-privacy=0 This setting is deprecated for wifi.cloned-mac-address. + + 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 @@ -621,7 +675,7 @@ ipv6.ip6-privacy=0 - + Sections You can configure multiple connection -- cgit 1.3.0-6-gf8a5