diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/Makefile.am | 9 | ||||
| -rw-r--r-- | man/Makefile.in | 31 | ||||
| -rw-r--r-- | man/NetworkManager.conf.xml | 906 | ||||
| -rw-r--r-- | man/NetworkManager.conf.xml.in | 906 | ||||
| -rw-r--r-- | man/NetworkManager.xml | 143 | ||||
| -rw-r--r-- | man/nm-settings-ifcfg-rh.5 | 38 | ||||
| -rw-r--r-- | man/nm-settings-ifcfg-rh.xml | 22 | ||||
| -rw-r--r-- | man/nm-settings-keyfile.5 | 6 | ||||
| -rw-r--r-- | man/nm-settings-keyfile.xml | 2 | ||||
| -rw-r--r-- | man/nm-settings.5 | 44 | ||||
| -rw-r--r-- | man/nm-settings.xml | 13 | ||||
| -rw-r--r-- | man/nmcli-examples.xml | 16 |
12 files changed, 1124 insertions, 1012 deletions
diff --git a/man/Makefile.am b/man/Makefile.am index 85b6f3a9..be33eeb2 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -78,8 +78,13 @@ docbook_generated_man_pages = \ docbook_autogenerated_man_pages = \ nm-settings.5 \ - nm-settings-keyfile.5 \ - nm-settings-ifcfg-rh.5 + nm-settings-keyfile.5 + +if CONFIG_PLUGIN_IFCFG_RH +docbook_autogenerated_man_pages += nm-settings-ifcfg-rh.5 +else +EXTRA_DIST += nm-settings-ifcfg-rh.5 +endif EXTRA_DIST += \ nm-settings.xml \ diff --git a/man/Makefile.in b/man/Makefile.in index 9e52f66f..edf86ef5 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -92,11 +92,13 @@ host_triplet = @host@ @BUILD_SETTING_DOCS_TRUE@ nm-settings-keyfile.xml \ @BUILD_SETTING_DOCS_TRUE@ nm-settings-ifcfg-rh.xml -@ENABLE_GTK_DOC_TRUE@am__append_2 = $(docbook_generated_man_pages) -@ENABLE_GTK_DOC_TRUE@am__append_3 = $(docbook_generated_man_pages) -@ENABLE_GTK_DOC_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_4 = $(docbook_autogenerated_man_pages) -@ENABLE_GTK_DOC_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_5 = $(docbook_autogenerated_man_pages) -@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@am__append_6 = \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_2 = nm-settings-ifcfg-rh.5 +@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_3 = nm-settings-ifcfg-rh.5 +@ENABLE_GTK_DOC_TRUE@am__append_4 = $(docbook_generated_man_pages) +@ENABLE_GTK_DOC_TRUE@am__append_5 = $(docbook_generated_man_pages) +@ENABLE_GTK_DOC_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_6 = $(docbook_autogenerated_man_pages) +@ENABLE_GTK_DOC_TRUE@@SETTING_DOCS_AVAILABLE_TRUE@am__append_7 = $(docbook_autogenerated_man_pages) +@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@am__append_8 = \ @ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@ $(docbook_generated_man_pages) \ @ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@ $(docbook_autogenerated_man_pages) @@ -444,12 +446,12 @@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ with_valgrind = @with_valgrind@ -man_MANS = $(configure_generated_man_pages) $(am__append_2) \ - $(am__append_4) $(am__append_6) -CLEANFILES = NetworkManager.conf.xml $(am__append_1) $(am__append_3) \ - $(am__append_5) -EXTRA_DIST = NetworkManager.conf.xml.in nm-settings.xml \ - nm-settings.xsl nm-settings-keyfile.xml \ +man_MANS = $(configure_generated_man_pages) $(am__append_4) \ + $(am__append_6) $(am__append_8) +CLEANFILES = NetworkManager.conf.xml $(am__append_1) $(am__append_5) \ + $(am__append_7) +EXTRA_DIST = NetworkManager.conf.xml.in $(am__append_3) \ + nm-settings.xml nm-settings.xsl nm-settings-keyfile.xml \ nm-settings-keyfile.xsl nm-settings-ifcfg-rh.xml \ nm-settings-ifcfg-rh.xsl $(addsuffix .xml,$(basename \ $(docbook_generated_man_pages))) \ @@ -476,11 +478,8 @@ docbook_generated_man_pages = \ NetworkManager.conf.5 \ nmcli-examples.5 -docbook_autogenerated_man_pages = \ - nm-settings.5 \ - nm-settings-keyfile.5 \ - nm-settings-ifcfg-rh.5 - +docbook_autogenerated_man_pages = nm-settings.5 nm-settings-keyfile.5 \ + $(am__append_2) links = nmtui-edit nmtui-connect nmtui-hostname all: all-am diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index b4fe396d..3e8b1e80 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -84,17 +84,17 @@ Copyright 2010 - 2014 Red Hat, Inc. <para> Minimal system settings configuration file looks like this: <programlisting> - [main] - plugins=keyfile - </programlisting> +[main] +plugins=keyfile +</programlisting> </para> <para> As an extension to the normal keyfile format, you can also append a value to a previously-set list-valued key by doing: <programlisting> - plugins+=another-plugin - plugins-=remove-me - </programlisting> +plugins+=another-plugin +plugins-=remove-me +</programlisting> </para> </refsect1> @@ -102,201 +102,201 @@ Copyright 2010 - 2014 Red Hat, Inc. <title><literal>main</literal> section</title> <variablelist> <varlistentry> - <term><varname>plugins</varname></term> - <listitem> - <para> - Lists system settings plugin names separated by ','. These - plugins are used to read and write system-wide - connections. When multiple plugins are specified, the - connections are read from all listed plugins. When writing - connections, the plugins will be asked to save the - connection in the order listed here; if the first plugin - cannot write out that connection type (or can't write out - any connections) the next plugin is tried, etc. If none of - the plugins can save the connection, an error is returned - to the user. - </para> - <para> - If NetworkManager defines a distro-specific - network-configuration plugin for your system, then that - will normally be listed here. (See below for the available - plugins.) Note that the <literal>keyfile</literal> plugin - is always appended to the end of this list (if it doesn't - already appear earlier in the list), so if there is no - distro-specific plugin for your system then you can leave - this key unset and NetworkManager will fall back to using - <literal>keyfile</literal>. - </para> - </listitem> + <term><varname>plugins</varname></term> + <listitem> + <para> + Lists system settings plugin names separated by ','. These + plugins are used to read and write system-wide + connections. When multiple plugins are specified, the + connections are read from all listed plugins. When writing + connections, the plugins will be asked to save the + connection in the order listed here; if the first plugin + cannot write out that connection type (or can't write out + any connections) the next plugin is tried, etc. If none of + the plugins can save the connection, an error is returned + to the user. + </para> + <para> + If NetworkManager defines a distro-specific + network-configuration plugin for your system, then that + will normally be listed here. (See below for the available + plugins.) Note that the <literal>keyfile</literal> plugin + is always appended to the end of this list (if it doesn't + already appear earlier in the list), so if there is no + distro-specific plugin for your system then you can leave + this key unset and NetworkManager will fall back to using + <literal>keyfile</literal>. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>monitor-connection-files</varname></term> - <listitem><para>Whether the configured settings plugin(s) - should set up file monitors and immediately pick up changes - made to connection files while NetworkManager is running. This - is disabled by default; NetworkManager will only read - the connection files at startup, and when explicitly requested - via the ReloadConnections D-Bus call. If this key is set to - '<literal>true</literal>', then NetworkManager will reload - connection files any time they changed.</para></listitem> + <term><varname>monitor-connection-files</varname></term> + <listitem><para>Whether the configured settings plugin(s) + should set up file monitors and immediately pick up changes + made to connection files while NetworkManager is running. This + is disabled by default; NetworkManager will only read + the connection files at startup, and when explicitly requested + via the ReloadConnections D-Bus call. If this key is set to + '<literal>true</literal>', then NetworkManager will reload + connection files any time they changed.</para></listitem> </varlistentry> <varlistentry> - <term><varname>auth-polkit</varname></term> - <listitem><para>Whether the system uses PolicyKit for authorization. - If <literal>false</literal>, all requests will be allowed. If - <literal>true</literal>, non-root requests are authorized using PolicyKit. - The default value is <literal>true</literal>. - </para></listitem> + <term><varname>auth-polkit</varname></term> + <listitem><para>Whether the system uses PolicyKit for authorization. + If <literal>false</literal>, all requests will be allowed. If + <literal>true</literal>, non-root requests are authorized using PolicyKit. + The default value is <literal>true</literal>. + </para></listitem> </varlistentry> <varlistentry> - <term><varname>dhcp</varname></term> - <listitem><para>This key sets up what DHCP client - NetworkManager will use. Allowed values are - <literal>dhclient</literal>, <literal>dhcpcd</literal>, and - <literal>internal</literal>. The <literal>dhclient</literal> - and <literal>dhcpcd</literal> options require the indicated - clients to be installed. The <literal>internal</literal> - option uses a built-in DHCP client which is not currently as - featureful as the external clients (and in particular, does - not yet support DHCPv6).</para> - <para>If this key is missing, available DHCP clients are - looked for in this order: <literal>dhclient</literal>, - <literal>dhcpcd</literal>, - <literal>internal</literal>.</para></listitem> + <term><varname>dhcp</varname></term> + <listitem><para>This key sets up what DHCP client + NetworkManager will use. Allowed values are + <literal>dhclient</literal>, <literal>dhcpcd</literal>, and + <literal>internal</literal>. The <literal>dhclient</literal> + and <literal>dhcpcd</literal> options require the indicated + clients to be installed. The <literal>internal</literal> + option uses a built-in DHCP client which is not currently as + featureful as the external clients (and in particular, does + not yet support DHCPv6).</para> + <para>If this key is missing, available DHCP clients are + looked for in this order: <literal>dhclient</literal>, + <literal>dhcpcd</literal>, + <literal>internal</literal>.</para></listitem> </varlistentry> <varlistentry> - <term><varname>no-auto-default</varname></term> - <listitem><para>Specify devices for which - NetworkManager shouldn't create default wired connection - (Auto eth0). By default, NetworkManager creates a temporary - wired connection for any Ethernet device that is managed and - doesn't have a connection configured. List a device in this - option to inhibit creating the default connection for the - device. May have the special value <literal>*</literal> to - apply to all devices.</para> - <para>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 - <filename>/var/run/NetworkManager/no-auto-default.state</filename> - to prevent creating the default connection for that device - again.</para> - <para>See <xref linkend="device-spec"/> for the syntax how to - specify a device. - </para> - <para> - Example: - <programlisting> + <term><varname>no-auto-default</varname></term> + <listitem><para>Specify devices for which + NetworkManager shouldn't create default wired connection + (Auto eth0). By default, NetworkManager creates a temporary + wired connection for any Ethernet device that is managed and + doesn't have a connection configured. List a device in this + option to inhibit creating the default connection for the + device. May have the special value <literal>*</literal> to + apply to all devices.</para> + <para>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 + <filename>/var/run/NetworkManager/no-auto-default.state</filename> + to prevent creating the default connection for that device + again.</para> + <para>See <xref linkend="device-spec"/> for the syntax how to + specify a device. + </para> + <para> + Example: + <programlisting> no-auto-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee no-auto-default=eth0,eth1 no-auto-default=* - </programlisting> - </para> - </listitem> +</programlisting> + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>ignore-carrier</varname></term> - <listitem> - <para> - Specify devices for which NetworkManager will (partially) - ignore the carrier state. Normally, for - device types that support carrier-detect, such as Ethernet - and InfiniBand, NetworkManager will only allow a - connection to be activated on the device if carrier is - present (ie, a cable is plugged in), and it will - deactivate the device if carrier drops for more than a few - seconds. - </para> - <para> - Listing a device here will allow activating connections on - that device even when it does not have carrier, provided - that the connection uses only statically-configured IP - addresses. Additionally, it will allow any active - connection (whether static or dynamic) to remain active on - the device when carrier is lost. - </para> - <para> - Note that the "carrier" property of NMDevices and device D-Bus - interfaces will still reflect the actual device state; it's just - that NetworkManager will not make use of that information. - </para> - <para>See <xref linkend="device-spec"/> for the syntax how to - specify a device. - </para> - </listitem> + <term><varname>ignore-carrier</varname></term> + <listitem> + <para> + Specify devices for which NetworkManager will (partially) + ignore the carrier state. Normally, for + device types that support carrier-detect, such as Ethernet + and InfiniBand, NetworkManager will only allow a + connection to be activated on the device if carrier is + present (ie, a cable is plugged in), and it will + deactivate the device if carrier drops for more than a few + seconds. + </para> + <para> + Listing a device here will allow activating connections on + that device even when it does not have carrier, provided + that the connection uses only statically-configured IP + addresses. Additionally, it will allow any active + connection (whether static or dynamic) to remain active on + the device when carrier is lost. + </para> + <para> + Note that the "carrier" property of NMDevices and device D-Bus + interfaces will still reflect the actual device state; it's just + that NetworkManager will not make use of that information. + </para> + <para>See <xref linkend="device-spec"/> for the syntax how to + specify a device. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>assume-ipv6ll-only</varname></term> - <listitem> - <para> - Specify devices for which NetworkManager will try to - generate a connection based on initial configuration when - the device only has an IPv6 link-local address. - </para> - <para>See <xref linkend="device-spec"/> for the syntax how to - specify a device. - </para> - </listitem> + <term><varname>assume-ipv6ll-only</varname></term> + <listitem> + <para> + Specify devices for which NetworkManager will try to + generate a connection based on initial configuration when + the device only has an IPv6 link-local address. + </para> + <para>See <xref linkend="device-spec"/> for the syntax how to + specify a device. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>configure-and-quit</varname></term> - <listitem> - <para> - When set to '<literal>true</literal>', NetworkManager quits after - performing initial network configuration but spawns small helpers - to preserve DHCP leases and IPv6 addresses. This is useful in - environments where network setup is more or less static or it is - desirable to save process time but still handle some dynamic - configurations. When this option is <literal>true</literal>, - network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE - interfaces cannot be preserved due to their use of external - services, and these devices will be deconfigured when NetworkManager - quits even though other interface's configuration may be preserved. - Also, to preserve DHCP addresses the '<literal>dhcp</literal>' option - must be set to '<literal>internal</literal>'. The default value of - the '<literal>configure-and-quit</literal>' option is - '<literal>false</literal>', meaning that NetworkManager will continue - running after initial network configuration and continue responding - to system and hardware events, D-Bus requests, and user commands. - </para> - </listitem> + <term><varname>configure-and-quit</varname></term> + <listitem> + <para> + When set to '<literal>true</literal>', NetworkManager quits after + performing initial network configuration but spawns small helpers + to preserve DHCP leases and IPv6 addresses. This is useful in + environments where network setup is more or less static or it is + desirable to save process time but still handle some dynamic + configurations. When this option is <literal>true</literal>, + network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE + interfaces cannot be preserved due to their use of external + services, and these devices will be deconfigured when NetworkManager + quits even though other interface's configuration may be preserved. + Also, to preserve DHCP addresses the '<literal>dhcp</literal>' option + must be set to '<literal>internal</literal>'. The default value of + the '<literal>configure-and-quit</literal>' option is + '<literal>false</literal>', meaning that NetworkManager will continue + running after initial network configuration and continue responding + to system and hardware events, D-Bus requests, and user commands. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>dns</varname></term> - <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.</para> - <para><literal>default</literal>: The default if the key is - not specified. NetworkManager will update - <filename>resolv.conf</filename> to reflect the nameservers - provided by currently active connections.</para> - <para><literal>dnsmasq</literal>: NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update - <filename>resolv.conf</filename> to point to the local - nameserver.</para> - <para><literal>unbound</literal>: NetworkManager will talk - to unbound and dnssec-triggerd, providing a "split DNS" - configuration with DNSSEC support. The /etc/resolv.conf - will be managed by dnssec-trigger daemon.</para> - <para><literal>none</literal>: NetworkManager will not - modify resolv.conf.</para> - </listitem> + <term><varname>dns</varname></term> + <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.</para> + <para><literal>default</literal>: The default if the key is + not specified. NetworkManager will update + <filename>resolv.conf</filename> to reflect the nameservers + provided by currently active connections.</para> + <para><literal>dnsmasq</literal>: NetworkManager will run + dnsmasq as a local caching nameserver, using a "split DNS" + configuration if you are connected to a VPN, and then update + <filename>resolv.conf</filename> to point to the local + nameserver.</para> + <para><literal>unbound</literal>: NetworkManager will talk + to unbound and dnssec-triggerd, providing a "split DNS" + configuration with DNSSEC support. The /etc/resolv.conf + will be managed by dnssec-trigger daemon.</para> + <para><literal>none</literal>: NetworkManager will not + modify resolv.conf.</para> + </listitem> </varlistentry> <varlistentry> - <term><varname>rc-manager</varname></term> - <listitem><para>Set the <filename>resolv.conf</filename> - management mode. The default value depends on how NetworkManager - was built.</para> - <para><literal>none</literal>: NetworkManager will directly - write changes to <filename>resolv.conf</filename>.</para> - <para><literal>resolvconf</literal>: NetworkManager will run - resolvconf to update the DNS configuration.</para> - <para><literal>netconfig</literal>: NetworkManager will run - netconfig to update the DNS configuration.</para> - </listitem> + <term><varname>rc-manager</varname></term> + <listitem><para>Set the <filename>resolv.conf</filename> + management mode. The default value depends on how NetworkManager + was built.</para> + <para><literal>none</literal>: NetworkManager will directly + write changes to <filename>resolv.conf</filename>.</para> + <para><literal>resolvconf</literal>: NetworkManager will run + resolvconf to update the DNS configuration.</para> + <para><literal>netconfig</literal>: NetworkManager will run + netconfig to update the DNS configuration.</para> + </listitem> </varlistentry> <varlistentry> @@ -329,13 +329,13 @@ no-auto-default=* <para> <variablelist> - <varlistentry> - <term><varname>hostname</varname></term> - <listitem><para>This key is deprecated and has no effect - since the hostname is now stored in /etc/hostname or other - system configuration files according to build options. - </para></listitem> - </varlistentry> + <varlistentry> + <term><varname>hostname</varname></term> + <listitem><para>This key is deprecated and has no effect + since the hostname is now stored in /etc/hostname or other + system configuration files according to build options. + </para></listitem> + </varlistentry> <varlistentry> <term><varname>path</varname></term> <listitem> @@ -344,23 +344,23 @@ no-auto-default=* </para> </listitem> </varlistentry> - <varlistentry> - <term><varname>unmanaged-devices</varname></term> - <listitem><para>Set devices that should be ignored by - NetworkManager. - </para> - <para>See <xref linkend="device-spec"/> for the syntax how to - specify a device. - </para> - <para> - Example: - <programlisting> + <varlistentry> + <term><varname>unmanaged-devices</varname></term> + <listitem><para>Set devices that should be ignored by + NetworkManager. + </para> + <para>See <xref linkend="device-spec"/> for the syntax how to + specify a device. + </para> + <para> + Example: + <programlisting> unmanaged-devices=interface-name:em4 unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth2 - </programlisting> - </para> - </listitem> - </varlistentry> +</programlisting> + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -372,23 +372,23 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth <para> <variablelist> - <varlistentry> - <term><varname>managed</varname></term> - <listitem><para>If set to <literal>true</literal>, then - interfaces listed in - <filename>/etc/network/interfaces</filename> are managed by - NetworkManager. If set to <literal>false</literal>, then - any interface listed in - <filename>/etc/network/interfaces</filename> will be ignored - by NetworkManager. Remember that NetworkManager controls the - default route, so because the interface is ignored, - NetworkManager may assign the default route to some other - interface.</para> - <para> - The default value is <literal>false</literal>. - </para> - </listitem> - </varlistentry> + <varlistentry> + <term><varname>managed</varname></term> + <listitem><para>If set to <literal>true</literal>, then + interfaces listed in + <filename>/etc/network/interfaces</filename> are managed by + NetworkManager. If set to <literal>false</literal>, then + any interface listed in + <filename>/etc/network/interfaces</filename> will be ignored + by NetworkManager. Remember that NetworkManager controls the + default route, so because the interface is ignored, + NetworkManager may assign the default route to some other + interface.</para> + <para> + The default value is <literal>false</literal>. + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -401,35 +401,35 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth <para> <variablelist> - <varlistentry> - <term><varname>level</varname></term> - <listitem><para>The default logging verbosity level. - One of <literal>OFF</literal>, <literal>ERR</literal>, - <literal>WARN</literal>, <literal>INFO</literal>, - <literal>DEBUG</literal>, <literal>TRACE</literal>. The ERR - level logs only critical errors. WARN logs warnings that may - reflect operation. INFO logs various informational messages that - are useful for tracking state and operations. DEBUG enables - verbose logging for debugging purposes. TRACE enables even more - verbose logging then DEBUG level. Subsequent levels also log - all messages from earlier levels; thus setting the log level - to INFO also logs error and warning messages.</para></listitem> - </varlistentry> - <varlistentry> - <term><varname>domains</varname></term> - <listitem><para>The following log domains are available: - PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, - WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, - AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, - INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, - TEAM, CONCHECK, DCB, DISPATCH, AUDIT.</para> - <para>In addition, these special domains can be used: NONE, - ALL, DEFAULT, DHCP, IP.</para> - <para>You can specify per-domain log level overrides by - adding a colon and a log level to any domain. E.g., - "<literal>WIFI:DEBUG,WIFI_SCAN:OFF</literal>".</para></listitem> - </varlistentry> - <varlistentry> + <varlistentry> + <term><varname>level</varname></term> + <listitem><para>The default logging verbosity level. + One of <literal>OFF</literal>, <literal>ERR</literal>, + <literal>WARN</literal>, <literal>INFO</literal>, + <literal>DEBUG</literal>, <literal>TRACE</literal>. The ERR + level logs only critical errors. WARN logs warnings that may + reflect operation. INFO logs various informational messages that + are useful for tracking state and operations. DEBUG enables + verbose logging for debugging purposes. TRACE enables even more + verbose logging then DEBUG level. Subsequent levels also log + all messages from earlier levels; thus setting the log level + to INFO also logs error and warning messages.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>domains</varname></term> + <listitem><para>The following log domains are available: + PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, + WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, + AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, + INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, + TEAM, CONCHECK, DCB, DISPATCH, AUDIT.</para> + <para>In addition, these special domains can be used: NONE, + ALL, DEFAULT, DHCP, IP.</para> + <para>You can specify per-domain log level overrides by + adding a colon and a log level to any domain. E.g., + "<literal>WIFI:DEBUG,WIFI_SCAN:OFF</literal>".</para></listitem> + </varlistentry> + <varlistentry> <para>Domain descriptions: <simplelist type="horiz" columns="1"> <member>PLATFORM : OS (platform) operations</member> @@ -479,41 +479,105 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth </simplelist> </para> </varlistentry> - <varlistentry> - <term><varname>backend</varname></term> - <listitem><para>The logging backend. Supported values - are "<literal>debug</literal>", "<literal>syslog</literal>", - "<literal>journal</literal>" and "<literal>journal-syslog-style</literal>. - "<literal>debug</literal>" uses syslog and logs to standard error. - "<literal>journal-syslog-style</literal>" prints the same message to journal - as it would print for "<literal>syslog</literal>", containing redundant - fields in the text. - If NetworkManager is started in debug mode (<literal>--debug</literal>) - this option is ignored and "<literal>debug</literal>" is always used. - Otherwise, the default is "<literal>journal-syslog-style</literal>". - </para></listitem> - </varlistentry> - <varlistentry> - <term><varname>audit</varname></term> - <listitem><para>Whether the audit records are delivered to - auditd, the audit daemon. If <literal>false</literal>, audit - records will be sent only to the NetworkManager logging - system. If set to <literal>true</literal>, they will be also - sent to auditd. The default value is <literal>true</literal>. - </para></listitem> - </varlistentry> + <varlistentry> + <term><varname>backend</varname></term> + <listitem><para>The logging backend. Supported values + are "<literal>debug</literal>", "<literal>syslog</literal>", + "<literal>journal</literal>" and "<literal>journal-syslog-style</literal>. + "<literal>debug</literal>" uses syslog and logs to standard error. + "<literal>journal-syslog-style</literal>" prints the same message to journal + as it would print for "<literal>syslog</literal>", containing redundant + fields in the text. + If NetworkManager is started in debug mode (<literal>--debug</literal>) + this option is ignored and "<literal>debug</literal>" is always used. + Otherwise, the default is "<literal>journal-syslog-style</literal>". + </para></listitem> + </varlistentry> + <varlistentry> + <term><varname>audit</varname></term> + <listitem><para>Whether the audit records are delivered to + auditd, the audit daemon. If <literal>false</literal>, audit + records will be sent only to the NetworkManager logging + system. If set to <literal>true</literal>, they will be also + sent to auditd. The default value is <literal>true</literal>. + </para></listitem> + </varlistentry> </variablelist> </para> </refsect1> <refsect1> <title><literal>connection</literal> section</title> - <para>This section allows to specify default values for - connections. Not all properties can be overwritten, only a selected - list below. You can have multiple <literal>connection</literal> - sections, by having different sections with a name that all start - with "connection".</para> + <para>Specify default values for connections. + </para> + <para> + Example: +<programlisting> +[connection] +ipv6.ip6-privacy=0 +</programlisting> + </para> + <refsect2> + <title>Supported Properties</title> <para> + Not all properties can be overwritten, only the following + properties are supported to have their default values configured + (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). + A default value is only consulted if the corresponding per-connection value + explicitly allows for that. + <variablelist> + <varlistentry> + <term><varname>connection.autoconnect-slaves</varname></term> + </varlistentry> + <varlistentry> + <term><varname>connection.lldp</varname></term> + </varlistentry> + <varlistentry> + <term><varname>ethernet.wake-on-lan</varname></term> + </varlistentry> + <varlistentry> + <term><varname>ipv4.dad-timeout</varname></term> + </varlistentry> + <varlistentry> + <term><varname>ipv4.dhcp-timeout</varname></term> + <listitem><para>If left unspecified, the default value for + the interface type is used.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>ipv4.route-metric</varname></term> + </varlistentry> + <varlistentry> + <term><varname>ipv6.ip6-privacy</varname></term> + <listitem><para>If <literal>ipv6.ip6-privacy</literal> is unset, use the content of + "/proc/sys/net/ipv6/conf/default/use_tempaddr" as last fallback. + </para></listitem> + </varlistentry> + <varlistentry> + <term><varname>ipv6.route-metric</varname></term> + </varlistentry> + <varlistentry> + <term><varname>vpn.timeout</varname></term> + <listitem><para>If left unspecified, default value of 60 seconds is used.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>wifi.mac-address-randomization</varname></term> + <listitem><para>If left unspecified, MAC address randomization is disabled.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>wifi.powersave</varname></term> + <listitem><para>If left unspecified, the default value + "<literal>ignore</literal>" will be used.</para></listitem> + </varlistentry> + </variablelist> + </para> + </refsect2> + + <refsect2> + <title>Sections</title> + <para> + You can configure multiple <literal>connection</literal> + sections, by having different sections with a name that all start + with "connection". Example: <programlisting> [connection] @@ -537,7 +601,7 @@ ipv6.ip6-privacy=1 exception that the <literal>[connection]</literal> section is always considered last. In the example above, this order is <literal>[connection-wifi-wlan0]</literal>, <literal>[connection-wlan-other]</literal>, and <literal>[connection]</literal>. - When checking for a default configuration value, the section are searched until + When checking for a default configuration value, the sections are searched until the requested value is found. In the example above, "ipv4.route-metric" for wlan0 interface is set to 50, and for all other Wi-Fi typed interfaces to 55. Also, Wi-Fi devices would have @@ -553,6 +617,7 @@ ipv6.ip6-privacy=1 </para> <para> + The following properties further control how a connection section applies. <variablelist> <varlistentry> <term><varname>match-device</varname></term> @@ -575,46 +640,7 @@ ipv6.ip6-privacy=1 </varlistentry> </variablelist> </para> - - <para> - The following properties are supported to have their default values configured: - <variablelist> - <varlistentry> - <term><varname>connection.autoconnect-slaves</varname></term> - </varlistentry> - <varlistentry> - <term><varname>connection.lldp</varname></term> - </varlistentry> - <varlistentry> - <term><varname>ethernet.wake-on-lan</varname></term> - </varlistentry> - <varlistentry> - <term><varname>ipv4.route-metric</varname></term> - </varlistentry> - <varlistentry> - <term><varname>ipv4.dhcp-timeout</varname></term> - <listitem><para>If left unspecified, the default value for - the interface type is used.</para></listitem> - </varlistentry> - <varlistentry> - <term><varname>ipv6.ip6-privacy</varname></term> - <listitem><para>If <literal>ipv6.ip6-privacy</literal> is unset, use the content of - "/proc/sys/net/ipv6/conf/default/use_tempaddr" as last fallback. - </para></listitem> - </varlistentry> - <varlistentry> - <term><varname>ipv6.route-metric</varname></term> - </varlistentry> - </variablelist> - <varlistentry> - <term><varname>vpn.timeout</varname></term> - <listitem><para>If left unspecified, default value of 60 seconds is used.</para></listitem> - </varlistentry> - <varlistentry> - <term><varname>wifi.mac-address-randomization</varname></term> - <listitem><para>If left unspecified, MAC address randomization is disabled.</para></listitem> - </varlistentry> - </para> + </refsect2> </refsect1> <refsect1> @@ -626,32 +652,32 @@ ipv6.ip6-privacy=1 <para> <variablelist> - <varlistentry> - <term><varname>uri</varname></term> - <listitem><para>The URI of a web page to periodically - request when connectivity is being checked. This page - should return the header "X-NetworkManager-Status" with a - value of "online". Alternatively, it's body content should - be set to "NetworkManager is online". The body content - check can be controlled by the <literal>response</literal> - option. If this option is blank or missing, connectivity - checking is disabled. - </para></listitem> - </varlistentry> - <varlistentry> - <term><varname>interval</varname></term> - <listitem><para>Specified in seconds; controls how often - connectivity is checked when a network connection exists. If - set to 0 connectivity checking is disabled. If missing, the - default is 300 seconds.</para></listitem> - </varlistentry> - <varlistentry> - <term><varname>response</varname></term> - <listitem><para>If set controls what body content - NetworkManager checks for when requesting the URI for - connectivity checking. If missing, defaults to - "NetworkManager is online" </para></listitem> - </varlistentry> + <varlistentry> + <term><varname>uri</varname></term> + <listitem><para>The URI of a web page to periodically + request when connectivity is being checked. This page + should return the header "X-NetworkManager-Status" with a + value of "online". Alternatively, it's body content should + be set to "NetworkManager is online". The body content + check can be controlled by the <literal>response</literal> + option. If this option is blank or missing, connectivity + checking is disabled. + </para></listitem> + </varlistentry> + <varlistentry> + <term><varname>interval</varname></term> + <listitem><para>Specified in seconds; controls how often + connectivity is checked when a network connection exists. If + set to 0 connectivity checking is disabled. If missing, the + default is 300 seconds.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>response</varname></term> + <listitem><para>If set controls what body content + NetworkManager checks for when requesting the URI for + connectivity checking. If missing, defaults to + "NetworkManager is online" </para></listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -662,22 +688,22 @@ ipv6.ip6-privacy=1 connection-specific configuration.</para> <para> <variablelist> - <varlistentry> - <term><varname>searches</varname></term> - <listitem> - <para> - A list of search domains to be used during hostname lookup. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term><varname>options</varname></term> - <listitem> - <para> - A list of of options to be passed to the hostname resolver. - </para> - </listitem> - </varlistentry> + <varlistentry> + <term><varname>searches</varname></term> + <listitem> + <para> + A list of search domains to be used during hostname lookup. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><varname>options</varname></term> + <listitem> + <para> + A list of of options to be passed to the hostname resolver. + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -694,22 +720,22 @@ ipv6.ip6-privacy=1 </para> <para> <variablelist> - <varlistentry> - <term><varname>servers</varname></term> - <listitem> - <para> - A list of addresses of DNS servers to be used for the given domain. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term><varname>options</varname></term> - <listitem> - <para> - A list of domain-specific DNS options. Not used at the moment. - </para> - </listitem> - </varlistentry> + <varlistentry> + <term><varname>servers</varname></term> + <listitem> + <para> + A list of addresses of DNS servers to be used for the given domain. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><varname>options</varname></term> + <listitem> + <para> + A list of domain-specific DNS options. Not used at the moment. + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -808,86 +834,86 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16 <variablelist> <varlistentry> - <term><varname>keyfile</varname></term> - <listitem> - <para> - The <literal>keyfile</literal> plugin is the generic - plugin that supports all the connection types and - capabilities that NetworkManager has. It writes files out - in an .ini-style format in - /etc/NetworkManager/system-connections. - </para> - <para> - The stored connection file may contain passwords and - private keys, so it will be made readable only to root, - and the plugin will ignore files that are readable or - writable by any user or group other than root. - </para> - <para> - This plugin is always active, and will automatically be - used to store any connections that aren't supported by any - other active plugin. - </para> - </listitem> + <term><varname>keyfile</varname></term> + <listitem> + <para> + The <literal>keyfile</literal> plugin is the generic + plugin that supports all the connection types and + capabilities that NetworkManager has. It writes files out + in an .ini-style format in + /etc/NetworkManager/system-connections. + </para> + <para> + The stored connection file may contain passwords and + private keys, so it will be made readable only to root, + and the plugin will ignore files that are readable or + writable by any user or group other than root. + </para> + <para> + This plugin is always active, and will automatically be + used to store any connections that aren't supported by any + other active plugin. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>ifcfg-rh</varname></term> - <listitem> - <para> - This plugin is used on the Fedora and Red Hat Enterprise - Linux distributions to read and write configuration from - the standard - <filename>/etc/sysconfig/network-scripts/ifcfg-*</filename> - files. It currently supports reading Ethernet, Wi-Fi, - InfiniBand, VLAN, Bond, Bridge, and Team connections. - Enabling <literal>ifcfg-rh</literal> implicitly enables - <literal>ibft</literal> plugin, if it is available. - This can be disabled by adding <literal>no-ibft</literal>. - </para> - </listitem> + <term><varname>ifcfg-rh</varname></term> + <listitem> + <para> + This plugin is used on the Fedora and Red Hat Enterprise + Linux distributions to read and write configuration from + the standard + <filename>/etc/sysconfig/network-scripts/ifcfg-*</filename> + files. It currently supports reading Ethernet, Wi-Fi, + InfiniBand, VLAN, Bond, Bridge, and Team connections. + Enabling <literal>ifcfg-rh</literal> implicitly enables + <literal>ibft</literal> plugin, if it is available. + This can be disabled by adding <literal>no-ibft</literal>. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>ifcfg-suse</varname></term> - <listitem> - <para> - This plugin is deprecated and its selection has no effect. - The <literal>keyfile</literal> plugin should be used - instead. - </para> - </listitem> + <term><varname>ifcfg-suse</varname></term> + <listitem> + <para> + This plugin is deprecated and its selection has no effect. + The <literal>keyfile</literal> plugin should be used + instead. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>ifupdown</varname></term> - <listitem> - <para> - This plugin is used on the Debian and Ubuntu - distributions, and reads Ethernet and Wi-Fi connections - from <filename>/etc/network/interfaces</filename>. - </para> - <para> - This plugin is read-only; any connections (of any type) - added from within NetworkManager when you are using this - plugin will be saved using the <literal>keyfile</literal> - plugin instead. - </para> - </listitem> + <term><varname>ifupdown</varname></term> + <listitem> + <para> + This plugin is used on the Debian and Ubuntu + distributions, and reads Ethernet and Wi-Fi connections + from <filename>/etc/network/interfaces</filename>. + </para> + <para> + This plugin is read-only; any connections (of any type) + added from within NetworkManager when you are using this + plugin will be saved using the <literal>keyfile</literal> + plugin instead. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>ibft</varname>, <varname>no-ibft</varname></term> - <listitem> - <para> - This plugin allows to read iBFT configuration (iSCSI Boot Firmware Table). - The configuration is read using /sbin/iscsiadm. Users are expected to - configure iBFT connections via the firmware interfaces. - If ibft support is available, it is automatically enabled after - <literal>ifcfg-rh</literal>. This can be disabled by <literal>no-ibft</literal>. - You can also explicitly specify <literal>ibft</literal> to load the - plugin without <literal>ifcfg-rh</literal> or to change the plugin order. - </para> - </listitem> + <term><varname>ibft</varname>, <varname>no-ibft</varname></term> + <listitem> + <para> + This plugin allows to read iBFT configuration (iSCSI Boot Firmware Table). + The configuration is read using /sbin/iscsiadm. Users are expected to + configure iBFT connections via the firmware interfaces. + If ibft support is available, it is automatically enabled after + <literal>ifcfg-rh</literal>. This can be disabled by <literal>no-ibft</literal>. + You can also explicitly specify <literal>ibft</literal> to load the + plugin without <literal>ifcfg-rh</literal> or to change the plugin order. + </para> + </listitem> </varlistentry> </variablelist> @@ -968,7 +994,7 @@ interface-name:em4 mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth2 interface-name:vboxnet*,except:interface-name:vboxnet2 *,except:mac:00:22:68:1c:59:b1 - </programlisting> +</programlisting> </para> </refsect2> </refsect1> diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in index 31c1cf8c..75e1d938 100644 --- a/man/NetworkManager.conf.xml.in +++ b/man/NetworkManager.conf.xml.in @@ -84,17 +84,17 @@ Copyright 2010 - 2014 Red Hat, Inc. <para> Minimal system settings configuration file looks like this: <programlisting> - [main] - plugins=keyfile - </programlisting> +[main] +plugins=keyfile +</programlisting> </para> <para> As an extension to the normal keyfile format, you can also append a value to a previously-set list-valued key by doing: <programlisting> - plugins+=another-plugin - plugins-=remove-me - </programlisting> +plugins+=another-plugin +plugins-=remove-me +</programlisting> </para> </refsect1> @@ -102,201 +102,201 @@ Copyright 2010 - 2014 Red Hat, Inc. <title><literal>main</literal> section</title> <variablelist> <varlistentry> - <term><varname>plugins</varname></term> - <listitem> - <para> - Lists system settings plugin names separated by ','. These - plugins are used to read and write system-wide - connections. When multiple plugins are specified, the - connections are read from all listed plugins. When writing - connections, the plugins will be asked to save the - connection in the order listed here; if the first plugin - cannot write out that connection type (or can't write out - any connections) the next plugin is tried, etc. If none of - the plugins can save the connection, an error is returned - to the user. - </para> - <para> - If NetworkManager defines a distro-specific - network-configuration plugin for your system, then that - will normally be listed here. (See below for the available - plugins.) Note that the <literal>keyfile</literal> plugin - is always appended to the end of this list (if it doesn't - already appear earlier in the list), so if there is no - distro-specific plugin for your system then you can leave - this key unset and NetworkManager will fall back to using - <literal>keyfile</literal>. - </para> - </listitem> + <term><varname>plugins</varname></term> + <listitem> + <para> + Lists system settings plugin names separated by ','. These + plugins are used to read and write system-wide + connections. When multiple plugins are specified, the + connections are read from all listed plugins. When writing + connections, the plugins will be asked to save the + connection in the order listed here; if the first plugin + cannot write out that connection type (or can't write out + any connections) the next plugin is tried, etc. If none of + the plugins can save the connection, an error is returned + to the user. + </para> + <para> + If NetworkManager defines a distro-specific + network-configuration plugin for your system, then that + will normally be listed here. (See below for the available + plugins.) Note that the <literal>keyfile</literal> plugin + is always appended to the end of this list (if it doesn't + already appear earlier in the list), so if there is no + distro-specific plugin for your system then you can leave + this key unset and NetworkManager will fall back to using + <literal>keyfile</literal>. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>monitor-connection-files</varname></term> - <listitem><para>Whether the configured settings plugin(s) - should set up file monitors and immediately pick up changes - made to connection files while NetworkManager is running. This - is disabled by default; NetworkManager will only read - the connection files at startup, and when explicitly requested - via the ReloadConnections D-Bus call. If this key is set to - '<literal>true</literal>', then NetworkManager will reload - connection files any time they changed.</para></listitem> + <term><varname>monitor-connection-files</varname></term> + <listitem><para>Whether the configured settings plugin(s) + should set up file monitors and immediately pick up changes + made to connection files while NetworkManager is running. This + is disabled by default; NetworkManager will only read + the connection files at startup, and when explicitly requested + via the ReloadConnections D-Bus call. If this key is set to + '<literal>true</literal>', then NetworkManager will reload + connection files any time they changed.</para></listitem> </varlistentry> <varlistentry> - <term><varname>auth-polkit</varname></term> - <listitem><para>Whether the system uses PolicyKit for authorization. - If <literal>false</literal>, all requests will be allowed. If - <literal>true</literal>, non-root requests are authorized using PolicyKit. - The default value is <literal>@NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@</literal>. - </para></listitem> + <term><varname>auth-polkit</varname></term> + <listitem><para>Whether the system uses PolicyKit for authorization. + If <literal>false</literal>, all requests will be allowed. If + <literal>true</literal>, non-root requests are authorized using PolicyKit. + The default value is <literal>@NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@</literal>. + </para></listitem> </varlistentry> <varlistentry> - <term><varname>dhcp</varname></term> - <listitem><para>This key sets up what DHCP client - NetworkManager will use. Allowed values are - <literal>dhclient</literal>, <literal>dhcpcd</literal>, and - <literal>internal</literal>. The <literal>dhclient</literal> - and <literal>dhcpcd</literal> options require the indicated - clients to be installed. The <literal>internal</literal> - option uses a built-in DHCP client which is not currently as - featureful as the external clients (and in particular, does - not yet support DHCPv6).</para> - <para>If this key is missing, available DHCP clients are - looked for in this order: <literal>dhclient</literal>, - <literal>dhcpcd</literal>, - <literal>internal</literal>.</para></listitem> + <term><varname>dhcp</varname></term> + <listitem><para>This key sets up what DHCP client + NetworkManager will use. Allowed values are + <literal>dhclient</literal>, <literal>dhcpcd</literal>, and + <literal>internal</literal>. The <literal>dhclient</literal> + and <literal>dhcpcd</literal> options require the indicated + clients to be installed. The <literal>internal</literal> + option uses a built-in DHCP client which is not currently as + featureful as the external clients (and in particular, does + not yet support DHCPv6).</para> + <para>If this key is missing, available DHCP clients are + looked for in this order: <literal>dhclient</literal>, + <literal>dhcpcd</literal>, + <literal>internal</literal>.</para></listitem> </varlistentry> <varlistentry> - <term><varname>no-auto-default</varname></term> - <listitem><para>Specify devices for which - NetworkManager shouldn't create default wired connection - (Auto eth0). By default, NetworkManager creates a temporary - wired connection for any Ethernet device that is managed and - doesn't have a connection configured. List a device in this - option to inhibit creating the default connection for the - device. May have the special value <literal>*</literal> to - apply to all devices.</para> - <para>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 - <filename>/var/run/NetworkManager/no-auto-default.state</filename> - to prevent creating the default connection for that device - again.</para> - <para>See <xref linkend="device-spec"/> for the syntax how to - specify a device. - </para> - <para> - Example: - <programlisting> + <term><varname>no-auto-default</varname></term> + <listitem><para>Specify devices for which + NetworkManager shouldn't create default wired connection + (Auto eth0). By default, NetworkManager creates a temporary + wired connection for any Ethernet device that is managed and + doesn't have a connection configured. List a device in this + option to inhibit creating the default connection for the + device. May have the special value <literal>*</literal> to + apply to all devices.</para> + <para>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 + <filename>/var/run/NetworkManager/no-auto-default.state</filename> + to prevent creating the default connection for that device + again.</para> + <para>See <xref linkend="device-spec"/> for the syntax how to + specify a device. + </para> + <para> + Example: + <programlisting> no-auto-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee no-auto-default=eth0,eth1 no-auto-default=* - </programlisting> - </para> - </listitem> +</programlisting> + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>ignore-carrier</varname></term> - <listitem> - <para> - Specify devices for which NetworkManager will (partially) - ignore the carrier state. Normally, for - device types that support carrier-detect, such as Ethernet - and InfiniBand, NetworkManager will only allow a - connection to be activated on the device if carrier is - present (ie, a cable is plugged in), and it will - deactivate the device if carrier drops for more than a few - seconds. - </para> - <para> - Listing a device here will allow activating connections on - that device even when it does not have carrier, provided - that the connection uses only statically-configured IP - addresses. Additionally, it will allow any active - connection (whether static or dynamic) to remain active on - the device when carrier is lost. - </para> - <para> - Note that the "carrier" property of NMDevices and device D-Bus - interfaces will still reflect the actual device state; it's just - that NetworkManager will not make use of that information. - </para> - <para>See <xref linkend="device-spec"/> for the syntax how to - specify a device. - </para> - </listitem> + <term><varname>ignore-carrier</varname></term> + <listitem> + <para> + Specify devices for which NetworkManager will (partially) + ignore the carrier state. Normally, for + device types that support carrier-detect, such as Ethernet + and InfiniBand, NetworkManager will only allow a + connection to be activated on the device if carrier is + present (ie, a cable is plugged in), and it will + deactivate the device if carrier drops for more than a few + seconds. + </para> + <para> + Listing a device here will allow activating connections on + that device even when it does not have carrier, provided + that the connection uses only statically-configured IP + addresses. Additionally, it will allow any active + connection (whether static or dynamic) to remain active on + the device when carrier is lost. + </para> + <para> + Note that the "carrier" property of NMDevices and device D-Bus + interfaces will still reflect the actual device state; it's just + that NetworkManager will not make use of that information. + </para> + <para>See <xref linkend="device-spec"/> for the syntax how to + specify a device. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>assume-ipv6ll-only</varname></term> - <listitem> - <para> - Specify devices for which NetworkManager will try to - generate a connection based on initial configuration when - the device only has an IPv6 link-local address. - </para> - <para>See <xref linkend="device-spec"/> for the syntax how to - specify a device. - </para> - </listitem> + <term><varname>assume-ipv6ll-only</varname></term> + <listitem> + <para> + Specify devices for which NetworkManager will try to + generate a connection based on initial configuration when + the device only has an IPv6 link-local address. + </para> + <para>See <xref linkend="device-spec"/> for the syntax how to + specify a device. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>configure-and-quit</varname></term> - <listitem> - <para> - When set to '<literal>true</literal>', NetworkManager quits after - performing initial network configuration but spawns small helpers - to preserve DHCP leases and IPv6 addresses. This is useful in - environments where network setup is more or less static or it is - desirable to save process time but still handle some dynamic - configurations. When this option is <literal>true</literal>, - network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE - interfaces cannot be preserved due to their use of external - services, and these devices will be deconfigured when NetworkManager - quits even though other interface's configuration may be preserved. - Also, to preserve DHCP addresses the '<literal>dhcp</literal>' option - must be set to '<literal>internal</literal>'. The default value of - the '<literal>configure-and-quit</literal>' option is - '<literal>false</literal>', meaning that NetworkManager will continue - running after initial network configuration and continue responding - to system and hardware events, D-Bus requests, and user commands. - </para> - </listitem> + <term><varname>configure-and-quit</varname></term> + <listitem> + <para> + When set to '<literal>true</literal>', NetworkManager quits after + performing initial network configuration but spawns small helpers + to preserve DHCP leases and IPv6 addresses. This is useful in + environments where network setup is more or less static or it is + desirable to save process time but still handle some dynamic + configurations. When this option is <literal>true</literal>, + network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE + interfaces cannot be preserved due to their use of external + services, and these devices will be deconfigured when NetworkManager + quits even though other interface's configuration may be preserved. + Also, to preserve DHCP addresses the '<literal>dhcp</literal>' option + must be set to '<literal>internal</literal>'. The default value of + the '<literal>configure-and-quit</literal>' option is + '<literal>false</literal>', meaning that NetworkManager will continue + running after initial network configuration and continue responding + to system and hardware events, D-Bus requests, and user commands. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>dns</varname></term> - <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.</para> - <para><literal>default</literal>: The default if the key is - not specified. NetworkManager will update - <filename>resolv.conf</filename> to reflect the nameservers - provided by currently active connections.</para> - <para><literal>dnsmasq</literal>: NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update - <filename>resolv.conf</filename> to point to the local - nameserver.</para> - <para><literal>unbound</literal>: NetworkManager will talk - to unbound and dnssec-triggerd, providing a "split DNS" - configuration with DNSSEC support. The /etc/resolv.conf - will be managed by dnssec-trigger daemon.</para> - <para><literal>none</literal>: NetworkManager will not - modify resolv.conf.</para> - </listitem> + <term><varname>dns</varname></term> + <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.</para> + <para><literal>default</literal>: The default if the key is + not specified. NetworkManager will update + <filename>resolv.conf</filename> to reflect the nameservers + provided by currently active connections.</para> + <para><literal>dnsmasq</literal>: NetworkManager will run + dnsmasq as a local caching nameserver, using a "split DNS" + configuration if you are connected to a VPN, and then update + <filename>resolv.conf</filename> to point to the local + nameserver.</para> + <para><literal>unbound</literal>: NetworkManager will talk + to unbound and dnssec-triggerd, providing a "split DNS" + configuration with DNSSEC support. The /etc/resolv.conf + will be managed by dnssec-trigger daemon.</para> + <para><literal>none</literal>: NetworkManager will not + modify resolv.conf.</para> + </listitem> </varlistentry> <varlistentry> - <term><varname>rc-manager</varname></term> - <listitem><para>Set the <filename>resolv.conf</filename> - management mode. The default value depends on how NetworkManager - was built.</para> - <para><literal>none</literal>: NetworkManager will directly - write changes to <filename>resolv.conf</filename>.</para> - <para><literal>resolvconf</literal>: NetworkManager will run - resolvconf to update the DNS configuration.</para> - <para><literal>netconfig</literal>: NetworkManager will run - netconfig to update the DNS configuration.</para> - </listitem> + <term><varname>rc-manager</varname></term> + <listitem><para>Set the <filename>resolv.conf</filename> + management mode. The default value depends on how NetworkManager + was built.</para> + <para><literal>none</literal>: NetworkManager will directly + write changes to <filename>resolv.conf</filename>.</para> + <para><literal>resolvconf</literal>: NetworkManager will run + resolvconf to update the DNS configuration.</para> + <para><literal>netconfig</literal>: NetworkManager will run + netconfig to update the DNS configuration.</para> + </listitem> </varlistentry> <varlistentry> @@ -329,13 +329,13 @@ no-auto-default=* <para> <variablelist> - <varlistentry> - <term><varname>hostname</varname></term> - <listitem><para>This key is deprecated and has no effect - since the hostname is now stored in /etc/hostname or other - system configuration files according to build options. - </para></listitem> - </varlistentry> + <varlistentry> + <term><varname>hostname</varname></term> + <listitem><para>This key is deprecated and has no effect + since the hostname is now stored in /etc/hostname or other + system configuration files according to build options. + </para></listitem> + </varlistentry> <varlistentry> <term><varname>path</varname></term> <listitem> @@ -344,23 +344,23 @@ no-auto-default=* </para> </listitem> </varlistentry> - <varlistentry> - <term><varname>unmanaged-devices</varname></term> - <listitem><para>Set devices that should be ignored by - NetworkManager. - </para> - <para>See <xref linkend="device-spec"/> for the syntax how to - specify a device. - </para> - <para> - Example: - <programlisting> + <varlistentry> + <term><varname>unmanaged-devices</varname></term> + <listitem><para>Set devices that should be ignored by + NetworkManager. + </para> + <para>See <xref linkend="device-spec"/> for the syntax how to + specify a device. + </para> + <para> + Example: + <programlisting> unmanaged-devices=interface-name:em4 unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth2 - </programlisting> - </para> - </listitem> - </varlistentry> +</programlisting> + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -372,23 +372,23 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth <para> <variablelist> - <varlistentry> - <term><varname>managed</varname></term> - <listitem><para>If set to <literal>true</literal>, then - interfaces listed in - <filename>/etc/network/interfaces</filename> are managed by - NetworkManager. If set to <literal>false</literal>, then - any interface listed in - <filename>/etc/network/interfaces</filename> will be ignored - by NetworkManager. Remember that NetworkManager controls the - default route, so because the interface is ignored, - NetworkManager may assign the default route to some other - interface.</para> - <para> - The default value is <literal>false</literal>. - </para> - </listitem> - </varlistentry> + <varlistentry> + <term><varname>managed</varname></term> + <listitem><para>If set to <literal>true</literal>, then + interfaces listed in + <filename>/etc/network/interfaces</filename> are managed by + NetworkManager. If set to <literal>false</literal>, then + any interface listed in + <filename>/etc/network/interfaces</filename> will be ignored + by NetworkManager. Remember that NetworkManager controls the + default route, so because the interface is ignored, + NetworkManager may assign the default route to some other + interface.</para> + <para> + The default value is <literal>false</literal>. + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -401,35 +401,35 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth <para> <variablelist> - <varlistentry> - <term><varname>level</varname></term> - <listitem><para>The default logging verbosity level. - One of <literal>OFF</literal>, <literal>ERR</literal>, - <literal>WARN</literal>, <literal>INFO</literal>, - <literal>DEBUG</literal>, <literal>TRACE</literal>. The ERR - level logs only critical errors. WARN logs warnings that may - reflect operation. INFO logs various informational messages that - are useful for tracking state and operations. DEBUG enables - verbose logging for debugging purposes. TRACE enables even more - verbose logging then DEBUG level. Subsequent levels also log - all messages from earlier levels; thus setting the log level - to INFO also logs error and warning messages.</para></listitem> - </varlistentry> - <varlistentry> - <term><varname>domains</varname></term> - <listitem><para>The following log domains are available: - PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, - WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, - AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, - INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, - TEAM, CONCHECK, DCB, DISPATCH, AUDIT.</para> - <para>In addition, these special domains can be used: NONE, - ALL, DEFAULT, DHCP, IP.</para> - <para>You can specify per-domain log level overrides by - adding a colon and a log level to any domain. E.g., - "<literal>WIFI:DEBUG,WIFI_SCAN:OFF</literal>".</para></listitem> - </varlistentry> - <varlistentry> + <varlistentry> + <term><varname>level</varname></term> + <listitem><para>The default logging verbosity level. + One of <literal>OFF</literal>, <literal>ERR</literal>, + <literal>WARN</literal>, <literal>INFO</literal>, + <literal>DEBUG</literal>, <literal>TRACE</literal>. The ERR + level logs only critical errors. WARN logs warnings that may + reflect operation. INFO logs various informational messages that + are useful for tracking state and operations. DEBUG enables + verbose logging for debugging purposes. TRACE enables even more + verbose logging then DEBUG level. Subsequent levels also log + all messages from earlier levels; thus setting the log level + to INFO also logs error and warning messages.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>domains</varname></term> + <listitem><para>The following log domains are available: + PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, + WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, + AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, + INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, + TEAM, CONCHECK, DCB, DISPATCH, AUDIT.</para> + <para>In addition, these special domains can be used: NONE, + ALL, DEFAULT, DHCP, IP.</para> + <para>You can specify per-domain log level overrides by + adding a colon and a log level to any domain. E.g., + "<literal>WIFI:DEBUG,WIFI_SCAN:OFF</literal>".</para></listitem> + </varlistentry> + <varlistentry> <para>Domain descriptions: <simplelist type="horiz" columns="1"> <member>PLATFORM : OS (platform) operations</member> @@ -479,41 +479,105 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth </simplelist> </para> </varlistentry> - <varlistentry> - <term><varname>backend</varname></term> - <listitem><para>The logging backend. Supported values - are "<literal>debug</literal>", "<literal>syslog</literal>", - "<literal>journal</literal>" and "<literal>journal-syslog-style</literal>. - "<literal>debug</literal>" uses syslog and logs to standard error. - "<literal>journal-syslog-style</literal>" prints the same message to journal - as it would print for "<literal>syslog</literal>", containing redundant - fields in the text. - If NetworkManager is started in debug mode (<literal>--debug</literal>) - this option is ignored and "<literal>debug</literal>" is always used. - Otherwise, the default is "<literal>@NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@</literal>". - </para></listitem> - </varlistentry> - <varlistentry> - <term><varname>audit</varname></term> - <listitem><para>Whether the audit records are delivered to - auditd, the audit daemon. If <literal>false</literal>, audit - records will be sent only to the NetworkManager logging - system. If set to <literal>true</literal>, they will be also - sent to auditd. The default value is <literal>@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@</literal>. - </para></listitem> - </varlistentry> + <varlistentry> + <term><varname>backend</varname></term> + <listitem><para>The logging backend. Supported values + are "<literal>debug</literal>", "<literal>syslog</literal>", + "<literal>journal</literal>" and "<literal>journal-syslog-style</literal>. + "<literal>debug</literal>" uses syslog and logs to standard error. + "<literal>journal-syslog-style</literal>" prints the same message to journal + as it would print for "<literal>syslog</literal>", containing redundant + fields in the text. + If NetworkManager is started in debug mode (<literal>--debug</literal>) + this option is ignored and "<literal>debug</literal>" is always used. + Otherwise, the default is "<literal>@NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@</literal>". + </para></listitem> + </varlistentry> + <varlistentry> + <term><varname>audit</varname></term> + <listitem><para>Whether the audit records are delivered to + auditd, the audit daemon. If <literal>false</literal>, audit + records will be sent only to the NetworkManager logging + system. If set to <literal>true</literal>, they will be also + sent to auditd. The default value is <literal>@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@</literal>. + </para></listitem> + </varlistentry> </variablelist> </para> </refsect1> <refsect1> <title><literal>connection</literal> section</title> - <para>This section allows to specify default values for - connections. Not all properties can be overwritten, only a selected - list below. You can have multiple <literal>connection</literal> - sections, by having different sections with a name that all start - with "connection".</para> + <para>Specify default values for connections. + </para> + <para> + Example: +<programlisting> +[connection] +ipv6.ip6-privacy=0 +</programlisting> + </para> + <refsect2> + <title>Supported Properties</title> <para> + Not all properties can be overwritten, only the following + properties are supported to have their default values configured + (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). + A default value is only consulted if the corresponding per-connection value + explicitly allows for that. + <variablelist> + <varlistentry> + <term><varname>connection.autoconnect-slaves</varname></term> + </varlistentry> + <varlistentry> + <term><varname>connection.lldp</varname></term> + </varlistentry> + <varlistentry> + <term><varname>ethernet.wake-on-lan</varname></term> + </varlistentry> + <varlistentry> + <term><varname>ipv4.dad-timeout</varname></term> + </varlistentry> + <varlistentry> + <term><varname>ipv4.dhcp-timeout</varname></term> + <listitem><para>If left unspecified, the default value for + the interface type is used.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>ipv4.route-metric</varname></term> + </varlistentry> + <varlistentry> + <term><varname>ipv6.ip6-privacy</varname></term> + <listitem><para>If <literal>ipv6.ip6-privacy</literal> is unset, use the content of + "/proc/sys/net/ipv6/conf/default/use_tempaddr" as last fallback. + </para></listitem> + </varlistentry> + <varlistentry> + <term><varname>ipv6.route-metric</varname></term> + </varlistentry> + <varlistentry> + <term><varname>vpn.timeout</varname></term> + <listitem><para>If left unspecified, default value of 60 seconds is used.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>wifi.mac-address-randomization</varname></term> + <listitem><para>If left unspecified, MAC address randomization is disabled.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>wifi.powersave</varname></term> + <listitem><para>If left unspecified, the default value + "<literal>ignore</literal>" will be used.</para></listitem> + </varlistentry> + </variablelist> + </para> + </refsect2> + + <refsect2> + <title>Sections</title> + <para> + You can configure multiple <literal>connection</literal> + sections, by having different sections with a name that all start + with "connection". Example: <programlisting> [connection] @@ -537,7 +601,7 @@ ipv6.ip6-privacy=1 exception that the <literal>[connection]</literal> section is always considered last. In the example above, this order is <literal>[connection-wifi-wlan0]</literal>, <literal>[connection-wlan-other]</literal>, and <literal>[connection]</literal>. - When checking for a default configuration value, the section are searched until + When checking for a default configuration value, the sections are searched until the requested value is found. In the example above, "ipv4.route-metric" for wlan0 interface is set to 50, and for all other Wi-Fi typed interfaces to 55. Also, Wi-Fi devices would have @@ -553,6 +617,7 @@ ipv6.ip6-privacy=1 </para> <para> + The following properties further control how a connection section applies. <variablelist> <varlistentry> <term><varname>match-device</varname></term> @@ -575,46 +640,7 @@ ipv6.ip6-privacy=1 </varlistentry> </variablelist> </para> - - <para> - The following properties are supported to have their default values configured: - <variablelist> - <varlistentry> - <term><varname>connection.autoconnect-slaves</varname></term> - </varlistentry> - <varlistentry> - <term><varname>connection.lldp</varname></term> - </varlistentry> - <varlistentry> - <term><varname>ethernet.wake-on-lan</varname></term> - </varlistentry> - <varlistentry> - <term><varname>ipv4.route-metric</varname></term> - </varlistentry> - <varlistentry> - <term><varname>ipv4.dhcp-timeout</varname></term> - <listitem><para>If left unspecified, the default value for - the interface type is used.</para></listitem> - </varlistentry> - <varlistentry> - <term><varname>ipv6.ip6-privacy</varname></term> - <listitem><para>If <literal>ipv6.ip6-privacy</literal> is unset, use the content of - "/proc/sys/net/ipv6/conf/default/use_tempaddr" as last fallback. - </para></listitem> - </varlistentry> - <varlistentry> - <term><varname>ipv6.route-metric</varname></term> - </varlistentry> - </variablelist> - <varlistentry> - <term><varname>vpn.timeout</varname></term> - <listitem><para>If left unspecified, default value of 60 seconds is used.</para></listitem> - </varlistentry> - <varlistentry> - <term><varname>wifi.mac-address-randomization</varname></term> - <listitem><para>If left unspecified, MAC address randomization is disabled.</para></listitem> - </varlistentry> - </para> + </refsect2> </refsect1> <refsect1> @@ -626,32 +652,32 @@ ipv6.ip6-privacy=1 <para> <variablelist> - <varlistentry> - <term><varname>uri</varname></term> - <listitem><para>The URI of a web page to periodically - request when connectivity is being checked. This page - should return the header "X-NetworkManager-Status" with a - value of "online". Alternatively, it's body content should - be set to "NetworkManager is online". The body content - check can be controlled by the <literal>response</literal> - option. If this option is blank or missing, connectivity - checking is disabled. - </para></listitem> - </varlistentry> - <varlistentry> - <term><varname>interval</varname></term> - <listitem><para>Specified in seconds; controls how often - connectivity is checked when a network connection exists. If - set to 0 connectivity checking is disabled. If missing, the - default is 300 seconds.</para></listitem> - </varlistentry> - <varlistentry> - <term><varname>response</varname></term> - <listitem><para>If set controls what body content - NetworkManager checks for when requesting the URI for - connectivity checking. If missing, defaults to - "NetworkManager is online" </para></listitem> - </varlistentry> + <varlistentry> + <term><varname>uri</varname></term> + <listitem><para>The URI of a web page to periodically + request when connectivity is being checked. This page + should return the header "X-NetworkManager-Status" with a + value of "online". Alternatively, it's body content should + be set to "NetworkManager is online". The body content + check can be controlled by the <literal>response</literal> + option. If this option is blank or missing, connectivity + checking is disabled. + </para></listitem> + </varlistentry> + <varlistentry> + <term><varname>interval</varname></term> + <listitem><para>Specified in seconds; controls how often + connectivity is checked when a network connection exists. If + set to 0 connectivity checking is disabled. If missing, the + default is 300 seconds.</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>response</varname></term> + <listitem><para>If set controls what body content + NetworkManager checks for when requesting the URI for + connectivity checking. If missing, defaults to + "NetworkManager is online" </para></listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -662,22 +688,22 @@ ipv6.ip6-privacy=1 connection-specific configuration.</para> <para> <variablelist> - <varlistentry> - <term><varname>searches</varname></term> - <listitem> - <para> - A list of search domains to be used during hostname lookup. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term><varname>options</varname></term> - <listitem> - <para> - A list of of options to be passed to the hostname resolver. - </para> - </listitem> - </varlistentry> + <varlistentry> + <term><varname>searches</varname></term> + <listitem> + <para> + A list of search domains to be used during hostname lookup. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><varname>options</varname></term> + <listitem> + <para> + A list of of options to be passed to the hostname resolver. + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -694,22 +720,22 @@ ipv6.ip6-privacy=1 </para> <para> <variablelist> - <varlistentry> - <term><varname>servers</varname></term> - <listitem> - <para> - A list of addresses of DNS servers to be used for the given domain. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term><varname>options</varname></term> - <listitem> - <para> - A list of domain-specific DNS options. Not used at the moment. - </para> - </listitem> - </varlistentry> + <varlistentry> + <term><varname>servers</varname></term> + <listitem> + <para> + A list of addresses of DNS servers to be used for the given domain. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><varname>options</varname></term> + <listitem> + <para> + A list of domain-specific DNS options. Not used at the moment. + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -808,86 +834,86 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16 <variablelist> <varlistentry> - <term><varname>keyfile</varname></term> - <listitem> - <para> - The <literal>keyfile</literal> plugin is the generic - plugin that supports all the connection types and - capabilities that NetworkManager has. It writes files out - in an .ini-style format in - /etc/NetworkManager/system-connections. - </para> - <para> - The stored connection file may contain passwords and - private keys, so it will be made readable only to root, - and the plugin will ignore files that are readable or - writable by any user or group other than root. - </para> - <para> - This plugin is always active, and will automatically be - used to store any connections that aren't supported by any - other active plugin. - </para> - </listitem> + <term><varname>keyfile</varname></term> + <listitem> + <para> + The <literal>keyfile</literal> plugin is the generic + plugin that supports all the connection types and + capabilities that NetworkManager has. It writes files out + in an .ini-style format in + /etc/NetworkManager/system-connections. + </para> + <para> + The stored connection file may contain passwords and + private keys, so it will be made readable only to root, + and the plugin will ignore files that are readable or + writable by any user or group other than root. + </para> + <para> + This plugin is always active, and will automatically be + used to store any connections that aren't supported by any + other active plugin. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>ifcfg-rh</varname></term> - <listitem> - <para> - This plugin is used on the Fedora and Red Hat Enterprise - Linux distributions to read and write configuration from - the standard - <filename>/etc/sysconfig/network-scripts/ifcfg-*</filename> - files. It currently supports reading Ethernet, Wi-Fi, - InfiniBand, VLAN, Bond, Bridge, and Team connections. - Enabling <literal>ifcfg-rh</literal> implicitly enables - <literal>ibft</literal> plugin, if it is available. - This can be disabled by adding <literal>no-ibft</literal>. - </para> - </listitem> + <term><varname>ifcfg-rh</varname></term> + <listitem> + <para> + This plugin is used on the Fedora and Red Hat Enterprise + Linux distributions to read and write configuration from + the standard + <filename>/etc/sysconfig/network-scripts/ifcfg-*</filename> + files. It currently supports reading Ethernet, Wi-Fi, + InfiniBand, VLAN, Bond, Bridge, and Team connections. + Enabling <literal>ifcfg-rh</literal> implicitly enables + <literal>ibft</literal> plugin, if it is available. + This can be disabled by adding <literal>no-ibft</literal>. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>ifcfg-suse</varname></term> - <listitem> - <para> - This plugin is deprecated and its selection has no effect. - The <literal>keyfile</literal> plugin should be used - instead. - </para> - </listitem> + <term><varname>ifcfg-suse</varname></term> + <listitem> + <para> + This plugin is deprecated and its selection has no effect. + The <literal>keyfile</literal> plugin should be used + instead. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>ifupdown</varname></term> - <listitem> - <para> - This plugin is used on the Debian and Ubuntu - distributions, and reads Ethernet and Wi-Fi connections - from <filename>/etc/network/interfaces</filename>. - </para> - <para> - This plugin is read-only; any connections (of any type) - added from within NetworkManager when you are using this - plugin will be saved using the <literal>keyfile</literal> - plugin instead. - </para> - </listitem> + <term><varname>ifupdown</varname></term> + <listitem> + <para> + This plugin is used on the Debian and Ubuntu + distributions, and reads Ethernet and Wi-Fi connections + from <filename>/etc/network/interfaces</filename>. + </para> + <para> + This plugin is read-only; any connections (of any type) + added from within NetworkManager when you are using this + plugin will be saved using the <literal>keyfile</literal> + plugin instead. + </para> + </listitem> </varlistentry> <varlistentry> - <term><varname>ibft</varname>, <varname>no-ibft</varname></term> - <listitem> - <para> - This plugin allows to read iBFT configuration (iSCSI Boot Firmware Table). - The configuration is read using /sbin/iscsiadm. Users are expected to - configure iBFT connections via the firmware interfaces. - If ibft support is available, it is automatically enabled after - <literal>ifcfg-rh</literal>. This can be disabled by <literal>no-ibft</literal>. - You can also explicitly specify <literal>ibft</literal> to load the - plugin without <literal>ifcfg-rh</literal> or to change the plugin order. - </para> - </listitem> + <term><varname>ibft</varname>, <varname>no-ibft</varname></term> + <listitem> + <para> + This plugin allows to read iBFT configuration (iSCSI Boot Firmware Table). + The configuration is read using /sbin/iscsiadm. Users are expected to + configure iBFT connections via the firmware interfaces. + If ibft support is available, it is automatically enabled after + <literal>ifcfg-rh</literal>. This can be disabled by <literal>no-ibft</literal>. + You can also explicitly specify <literal>ibft</literal> to load the + plugin without <literal>ifcfg-rh</literal> or to change the plugin order. + </para> + </listitem> </varlistentry> </variablelist> @@ -968,7 +994,7 @@ interface-name:em4 mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth2 interface-name:vboxnet*,except:interface-name:vboxnet2 *,except:mac:00:22:68:1c:59:b1 - </programlisting> +</programlisting> </para> </refsect2> </refsect1> diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml index 2df37d9a..e674943e 100644 --- a/man/NetworkManager.xml +++ b/man/NetworkManager.xml @@ -191,13 +191,18 @@ <varlistentry> <term><varname>DEVICE_IFACE</varname></term> <listitem><para> - The interface name of the device. + The interface name of the control interface of the device. + Depending on the device type, this differs from + <varname>DEVICE_IP_IFACE</varname>. For example for + ADSL devices, this could be 'atm0' or for WWAN devices + it might be 'ttyUSB0'. </para></listitem> </varlistentry> <varlistentry> <term><varname>DEVICE_IP_IFACE</varname></term> <listitem><para> - The IP interface name of the device. + The IP interface name of the device. This is the network + interface on which IP addresses and routes will be configured. </para></listitem> </varlistentry> <varlistentry> @@ -286,79 +291,79 @@ <variablelist> <varlistentry> - <term><option>--version</option> | <option>-V</option></term> - <listitem><para>Print the NetworkManager software version and exit. - </para></listitem> + <term><option>--version</option> | <option>-V</option></term> + <listitem><para>Print the NetworkManager software version and exit. + </para></listitem> </varlistentry> <varlistentry> - <term><option>--help</option> | <option>-h</option></term> - <listitem><para>Print NetworkManager's available options and exit. - </para></listitem> + <term><option>--help</option> | <option>-h</option></term> + <listitem><para>Print NetworkManager's available options and exit. + </para></listitem> </varlistentry> <varlistentry> - <term><option>--no-daemon</option> | <option>-n</option></term> - <listitem><para>Do not daemonize. - </para></listitem> + <term><option>--no-daemon</option> | <option>-n</option></term> + <listitem><para>Do not daemonize. + </para></listitem> </varlistentry> <varlistentry> - <term><option>--debug</option> | <option>-d</option></term> - <listitem><para>Do not daemonize, and direct log output to the - controlling terminal in addition to syslog. - </para></listitem> + <term><option>--debug</option> | <option>-d</option></term> + <listitem><para>Do not daemonize, and direct log output to the + controlling terminal in addition to syslog. + </para></listitem> </varlistentry> <varlistentry> - <term><option>--pid-file</option> | <option>-p</option></term> - <listitem><para>Specify location of a PID file. The PID file - is used for storing PID of the running process and prevents - running multiple instances. - </para></listitem> + <term><option>--pid-file</option> | <option>-p</option></term> + <listitem><para>Specify location of a PID file. The PID file + is used for storing PID of the running process and prevents + running multiple instances. + </para></listitem> </varlistentry> <varlistentry> - <term><option>--state-file</option></term> - <listitem><para>Specify file for storing state of the - NetworkManager persistently. If not specified, the default - value of /var/lib/NetworkManager/NetworkManager.state is used. - </para></listitem> + <term><option>--state-file</option></term> + <listitem><para>Specify file for storing state of the + NetworkManager persistently. If not specified, the default + value of /var/lib/NetworkManager/NetworkManager.state is used. + </para></listitem> </varlistentry> <varlistentry> - <term><option>--config</option></term> - <listitem><para> Specify configuration file to set up various - settings for NetworkManager. If not specified, the default - value of /etc/NetworkManager/NetworkManager.conf is used with - a fallback to the older 'nm-system-settings.conf' if located - in the same directory. See - <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> - for more information on configuration file. - </para></listitem> + <term><option>--config</option></term> + <listitem><para> Specify configuration file to set up various + settings for NetworkManager. If not specified, the default + value of /etc/NetworkManager/NetworkManager.conf is used with + a fallback to the older 'nm-system-settings.conf' if located + in the same directory. See + <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> + for more information on configuration file. + </para></listitem> </varlistentry> <varlistentry> - <term><option>--plugins</option></term> - <listitem><para>List plugins used to manage system-wide - connection settings. This list has preference over plugins - specified in the configuration file. Currently supported - plugins are: keyfile, <option>ifcfg-rh</option>, - <option>ifcfg-suse</option>, <option>ifupdown</option>. - </para></listitem> + <term><option>--plugins</option></term> + <listitem><para>List plugins used to manage system-wide + connection settings. This list has preference over plugins + specified in the configuration file. Currently supported + plugins are: keyfile, <option>ifcfg-rh</option>, + <option>ifcfg-suse</option>, <option>ifupdown</option>. + </para></listitem> </varlistentry> <varlistentry> - <term><option>--log-level</option></term> - <listitem><para> - Sets how much information NetworkManager sends to the log destination (usually - syslog's "daemon" facility). By default, only informational, warning, and error - messages are logged. See the section on <literal>logging</literal> in - <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> - for more information. - </para></listitem> + <term><option>--log-level</option></term> + <listitem><para> + Sets how much information NetworkManager sends to the log destination (usually + syslog's "daemon" facility). By default, only informational, warning, and error + messages are logged. See the section on <literal>logging</literal> in + <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> + for more information. + </para></listitem> </varlistentry> <varlistentry> - <term><option>--log-domains</option></term> - <listitem><para> - A comma-separated list specifying which operations are logged to the log - destination (usually syslog). By default, most domains are logging-enabled. - See the section on <literal>logging</literal> in - <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> - for more information. - </para></listitem> + <term><option>--log-domains</option></term> + <listitem><para> + A comma-separated list specifying which operations are logged to the log + destination (usually syslog). By default, most domains are logging-enabled. + See the section on <literal>logging</literal> in + <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> + for more information. + </para></listitem> </varlistentry> <varlistentry> <term><option>--print-config</option></term> @@ -380,18 +385,18 @@ <variablelist> <varlistentry> - <term><varname>NM_UNMANAGED</varname></term> - <listitem><para> - No default connection will be created and automatic activation - will not be attempted when this property of a device is set to a - true value ("1" or "true"). You will still be able to attach a - connection to the device manually or observe externally added - configuration such as addresses or routes. - </para><para> - Create an udev rule that sets this property to prevent NetworkManager - from interfering with virtual Ethernet device interfaces that are - managed by virtualization tools. - </para></listitem> + <term><varname>NM_UNMANAGED</varname></term> + <listitem><para> + No default connection will be created and automatic activation + will not be attempted when this property of a device is set to a + true value ("1" or "true"). You will still be able to attach a + connection to the device manually or observe externally added + configuration such as addresses or routes. + </para><para> + Create an udev rule that sets this property to prevent NetworkManager + from interfering with virtual Ethernet device interfaces that are + managed by virtualization tools. + </para></listitem> </varlistentry> </variablelist> </refsect1> diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index 5b0435f8..58daaba0 100644 --- a/man/nm-settings-ifcfg-rh.5 +++ b/man/nm-settings-ifcfg-rh.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-ifcfg-rh .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 19 January 2016 +.\" Date: 01 March 2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.1.90 +.\" Source: NetworkManager 1.1.91 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.1\&.90" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.1\&.91" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1400,6 +1400,7 @@ l l l l l l l l l l l l l l l l +l l l l l l l l. T{ method @@ -1538,15 +1539,26 @@ A string sent to the DHCP server to identify the local machine\&.\fB Example: \fRDHCP_CLIENT_ID=ax\-srv\-1 T} T{ +dad\-timeout +T}:T{ +ARPING_WAIT +T}:T{ +missing variable means global default (config override or 3) +T}:T{ +Timeout (in seconds) for performing DAD before configuring IPv4 addresses\&. 0 turns off the DAD completely, \-1 means default value\&.\fB + +Example: \fRARPING_WAIT=2 +T} +T{ dhcp\-timeout T}:T{ -DHCP_TIMEOUT\fI(+)\fR +IPV4_DHCP_TIMEOUT\fI(+)\fR T}:T{ \ \& T}:T{ A timeout after which the DHCP transaction fails in case of no response\&.\fB -Example: \fRDHCP_TIMEOUT=10 +Example: \fRIPV4_DHCP_TIMEOUT=10 T} T{ dhcp\-fqdn @@ -1886,13 +1898,13 @@ T} T{ flags T}:T{ -REORDER_HDR, GVRP, MVRP, VLAN_FLAGS +GVRP, MVRP, VLAN_FLAGS T}:T{ \ \& T}:T{ VLAN flags\&.\fB -Allowed values: \fR"yes or "no" for REORDER_HDR, GVRP and MVRP; "LOOSE_BINDING" for VLAN_FLAGS +Allowed values: \fR"yes or "no" for GVRP and MVRP; "LOOSE_BINDING" and "NO_REORDER_HDR" for VLAN_FLAGS T} T{ ingress\-priority\-map @@ -2466,24 +2478,26 @@ powersave T}:T{ POWERSAVE\fI(+)\fR T}:T{ -no +\ \& T}:T{ Enables or disables Wi\-Fi power saving\&.\fB -Example: \fRPOWERSAVE=yes +Example: \fRPOWERSAVE=enable\fB + +Allowed values: \fRdefault, ignore, enable, disable T} T{ mac\-address\-randomization T}:T{ MAC_ADDRESS_RANDOMIZATION\fI(+)\fR T}:T{ -1 +\ \& T}:T{ Enables or disables Wi\-Fi MAC address randomization\&.\fB -Example: \fRMAC_ADDRESS_RANDOMIZATION=2\fB +Example: \fRMAC_ADDRESS_RANDOMIZATION=always\fB -Allowed values: \fR0 (default), (1) never, (2) always +Allowed values: \fRdefault, never, always T} T{ security diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index 7d577106..b161f5aa 100644 --- a/man/nm-settings-ifcfg-rh.xml +++ b/man/nm-settings-ifcfg-rh.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> -<refentry id="nm-settings-ifcfg-rh"><refentryinfo><date>19 January 2016</date></refentryinfo><refmeta><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.90</refmiscinfo></refmeta><refnamediv><refname>nm-settings-ifcfg-rh</refname><refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose></refnamediv><refsect1><title>DESCRIPTION</title><para> +<refentry id="nm-settings-ifcfg-rh"><refentryinfo><date>01 March 2016</date></refentryinfo><refmeta><refentrytitle>nm-settings-ifcfg-rh</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.91</refmiscinfo></refmeta><refnamediv><refname>nm-settings-ifcfg-rh</refname><refpurpose>Description of <emphasis>ifcfg-rh</emphasis> settings plugin</refpurpose></refnamediv><refsect1><title>DESCRIPTION</title><para> NetworkManager is based on the concept of connection profiles that contain network configuration (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing @@ -286,9 +286,11 @@ Example: </emphasis>IPADDR=10.5.5.23 PREFIX=24 IPADDR1=1.1.1.2 PREFIX1=16</entry Example: </emphasis>GATEWAY=10.5.5.1</entry></row><row><entry align="left">routes</entry><entry align="left">ADDRESS1, NETMASK1, GATEWAY1, METRIC1, ...</entry><entry align="left"/><entry align="left">List of static routes. They are not stored in ifcfg-* file, but in route-* file instead.</entry></row><row><entry align="left">ignore-auto-routes</entry><entry align="left">PEERROUTES<emphasis>(+)</emphasis></entry><entry align="left">yes</entry><entry align="left">PEERROUTES has the opposite meaning as 'ignore-auto-routes' property.</entry></row><row><entry align="left">ignore-auto-dns</entry><entry align="left">PEERDNS</entry><entry align="left">yes</entry><entry align="left">PEERDNS has the opposite meaning as 'ignore-auto-dns' property.</entry></row><row><entry align="left">dhcp-send-hostname</entry><entry align="left">DHCP_SEND_HOSTNAME<emphasis>(+)</emphasis></entry><entry align="left">yes</entry><entry align="left">Whether DHCP_HOSTNAME should be sent to the DHCP server.</entry></row><row><entry align="left">dhcp-hostname</entry><entry align="left">DHCP_HOSTNAME</entry><entry align="left"/><entry align="left">Hostname to send to the DHCP server. When both DHCP_HOSTNAME and DHCP_FQDN are specified only the latter is used.</entry></row><row><entry align="left">never-default</entry><entry align="left">DEFROUTE (GATEWAYDEV in /etc/sysconfig/network)</entry><entry align="left">yes</entry><entry align="left">DEFROUTE=no tells NetworkManager that this connection should not be assigned the default route. DEFROUTE has the opposite meaning as 'never-default' property.</entry></row><row><entry align="left">may-fail</entry><entry align="left">IPV4_FAILURE_FATAL<emphasis>(+)</emphasis></entry><entry align="left">no</entry><entry align="left">IPV4_FAILURE_FATAL has the opposite meaning as 'may-fail' property.</entry></row><row><entry align="left">route-metric</entry><entry align="left">IPV4_ROUTE_METRIC<emphasis>(+)</emphasis></entry><entry align="left">-1</entry><entry align="left">IPV4_ROUTE_METRIC is the default IPv4 metric for routes on this connection. If set to -1, a default metric based on the device type is used.</entry></row><row><entry align="left">dhcp-client-id</entry><entry align="left">DHCP_CLIENT_ID<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">A string sent to the DHCP server to identify the local machine.<emphasis role="bold"> -Example: </emphasis>DHCP_CLIENT_ID=ax-srv-1</entry></row><row><entry align="left">dhcp-timeout</entry><entry align="left">DHCP_TIMEOUT<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">A timeout after which the DHCP transaction fails in case of no response.<emphasis role="bold"> +Example: </emphasis>DHCP_CLIENT_ID=ax-srv-1</entry></row><row><entry align="left">dad-timeout</entry><entry align="left">ARPING_WAIT</entry><entry align="left">missing variable means global default (config override or 3)</entry><entry align="left">Timeout (in seconds) for performing DAD before configuring IPv4 addresses. 0 turns off the DAD completely, -1 means default value.<emphasis role="bold"> -Example: </emphasis>DHCP_TIMEOUT=10</entry></row><row><entry align="left">dhcp-fqdn</entry><entry align="left">DHCP_FQDN</entry><entry align="left"/><entry align="left">FQDN to send to the DHCP server. When both DHCP_HOSTNAME and DHCP_FQDN are specified only the latter is used.<emphasis role="bold"> +Example: </emphasis>ARPING_WAIT=2</entry></row><row><entry align="left">dhcp-timeout</entry><entry align="left">IPV4_DHCP_TIMEOUT<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">A timeout after which the DHCP transaction fails in case of no response.<emphasis role="bold"> + +Example: </emphasis>IPV4_DHCP_TIMEOUT=10</entry></row><row><entry align="left">dhcp-fqdn</entry><entry align="left">DHCP_FQDN</entry><entry align="left"/><entry align="left">FQDN to send to the DHCP server. When both DHCP_HOSTNAME and DHCP_FQDN are specified only the latter is used.<emphasis role="bold"> Example: </emphasis>DHCP_FQDN=foo.bar.com</entry></row></tbody></tgroup></table><table><title>ipv6 setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody><row><entry align="left">method</entry><entry align="left">IPV6INIT, IPV6FORWARDING, IPV6_AUTOCONF, DHCPV6C</entry><entry align="left">IPV6INIT=yes; IPV6FORWARDING=no; IPV6_AUTOCONF=!IPV6FORWARDING, DHCPV6=no</entry><entry align="left">Method used for IPv6 protocol configuration. ignore ~ IPV6INIT=no; auto ~ IPV6_AUTOCONF=yes; dhcp ~ IPV6_AUTOCONF=no and DHCPV6C=yes</entry></row><row><entry align="left">dns</entry><entry align="left">DNS1, DNS2, ...</entry><entry align="left"/><entry align="left">List of DNS servers. NetworkManager uses the variables both for IPv4 and IPv6.</entry></row><row><entry align="left">dns-search</entry><entry align="left">DOMAIN</entry><entry align="left"/><entry align="left">List of DNS search domains.</entry></row><row><entry align="left">addresses</entry><entry align="left">IPV6ADDR, IPV6ADDR_SECONDARIES</entry><entry align="left"/><entry align="left">List of static IP addresses.<emphasis role="bold"> @@ -302,9 +304,9 @@ Allowed values: </emphasis>IPV6_PRIVACY: no, yes (rfc3041 or rfc4941); IPV6_PRIV Example: </emphasis>IPV6_ADDR_GEN_MODE=stable-privacy<emphasis role="bold"> -Allowed values: </emphasis>IPV6_ADDR_GEN_MODE: eui64, stable-privacy</entry></row></tbody></tgroup></table><table><title>macvlan setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody/></tgroup></table><table><title>team-port setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody><row><entry align="left">config</entry><entry align="left">TEAM_PORT_CONFIG</entry><entry align="left"/><entry align="left">Team port configuration in JSON. See man teamd.conf for details.</entry></row></tbody></tgroup></table><table><title>team setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody><row><entry align="left">config</entry><entry align="left">TEAM_CONFIG</entry><entry align="left"/><entry align="left">Team configuration in JSON. See man teamd.conf for details.</entry></row></tbody></tgroup></table><table><title>tun setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody/></tgroup></table><table><title>vlan setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody><row><entry align="left">parent</entry><entry align="left">DEVICE or PHYSDEV</entry><entry align="left"/><entry align="left">Parent interface of the VLAN.</entry></row><row><entry align="left">id</entry><entry align="left">VLAN_ID or DEVICE</entry><entry align="left"/><entry align="left">VLAN identifier.</entry></row><row><entry align="left">flags</entry><entry align="left">REORDER_HDR, GVRP, MVRP, VLAN_FLAGS</entry><entry align="left"/><entry align="left">VLAN flags.<emphasis role="bold"> +Allowed values: </emphasis>IPV6_ADDR_GEN_MODE: eui64, stable-privacy</entry></row></tbody></tgroup></table><table><title>macvlan setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody/></tgroup></table><table><title>team-port setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody><row><entry align="left">config</entry><entry align="left">TEAM_PORT_CONFIG</entry><entry align="left"/><entry align="left">Team port configuration in JSON. See man teamd.conf for details.</entry></row></tbody></tgroup></table><table><title>team setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody><row><entry align="left">config</entry><entry align="left">TEAM_CONFIG</entry><entry align="left"/><entry align="left">Team configuration in JSON. See man teamd.conf for details.</entry></row></tbody></tgroup></table><table><title>tun setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody/></tgroup></table><table><title>vlan setting</title><tgroup cols="4"><thead><row><entry>Property</entry><entry>Ifcfg-rh Variable</entry><entry>Default</entry><entry>Description</entry></row></thead><tbody><row><entry align="left">parent</entry><entry align="left">DEVICE or PHYSDEV</entry><entry align="left"/><entry align="left">Parent interface of the VLAN.</entry></row><row><entry align="left">id</entry><entry align="left">VLAN_ID or DEVICE</entry><entry align="left"/><entry align="left">VLAN identifier.</entry></row><row><entry align="left">flags</entry><entry align="left">GVRP, MVRP, VLAN_FLAGS</entry><entry align="left"/><entry align="left">VLAN flags.<emphasis role="bold"> -Allowed values: </emphasis>"yes or "no" for REORDER_HDR, GVRP and MVRP; "LOOSE_BINDING" for VLAN_FLAGS</entry></row><row><entry align="left">ingress-priority-map</entry><entry align="left">VLAN_INGRESS_PRIORITY_MAP</entry><entry align="left"/><entry align="left">Ingress priority mapping.<emphasis role="bold"> +Allowed values: </emphasis>"yes or "no" for GVRP and MVRP; "LOOSE_BINDING" and "NO_REORDER_HDR" for VLAN_FLAGS</entry></row><row><entry align="left">ingress-priority-map</entry><entry align="left">VLAN_INGRESS_PRIORITY_MAP</entry><entry align="left"/><entry align="left">Ingress priority mapping.<emphasis role="bold"> Example: </emphasis>VLAN_INGRESS_PRIORITY_MAP=4:2,3:5</entry></row><row><entry align="left">egress-priority-map</entry><entry align="left">VLAN_EGRESS_PRIORITY_MAP</entry><entry align="left"/><entry align="left">Egress priority mapping.<emphasis role="bold"> @@ -346,13 +348,15 @@ Allowed values: </emphasis>a, bg</entry></row><row><entry align="left">channel</ Example: </emphasis>CHANNEL=6</entry></row><row><entry align="left">bssid</entry><entry align="left">BSSID<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">Restricts association only to a single AP.<emphasis role="bold"> -Example: </emphasis>BSSID=00:1E:BD:64:83:21</entry></row><row><entry align="left">rate</entry><entry align="left">(none)</entry><entry align="left"/><entry align="left">This property is not handled by ifcfg-rh plugin.</entry></row><row><entry align="left">tx-power</entry><entry align="left">(none)</entry><entry align="left"/><entry align="left">This property is not handled by ifcfg-rh plugin.</entry></row><row><entry align="left">mac-address</entry><entry align="left">HWADDR</entry><entry align="left"/><entry align="left">Hardware address of the device in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:05).</entry></row><row><entry align="left">cloned-mac-address</entry><entry align="left">MACADDR</entry><entry align="left"/><entry align="left">Cloned (spoofed) MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:99).</entry></row><row><entry align="left">mac-address-blacklist</entry><entry align="left">HWADDR_BLACKLIST<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">It denies usage of the connection for any device whose address is listed.</entry></row><row><entry align="left">seen-bssids</entry><entry align="left">(none)</entry><entry align="left"/><entry align="left">This property is not handled by ifcfg-rh plugin.</entry></row><row><entry align="left">mtu</entry><entry align="left">MTU</entry><entry align="left"/><entry align="left">MTU of the wireless interface.</entry></row><row><entry align="left">hidden</entry><entry align="left">SSID_HIDDEN<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">Whether the network hides the SSID.</entry></row><row><entry align="left">powersave</entry><entry align="left">POWERSAVE<emphasis>(+)</emphasis></entry><entry align="left">no</entry><entry align="left">Enables or disables Wi-Fi power saving.<emphasis role="bold"> +Example: </emphasis>BSSID=00:1E:BD:64:83:21</entry></row><row><entry align="left">rate</entry><entry align="left">(none)</entry><entry align="left"/><entry align="left">This property is not handled by ifcfg-rh plugin.</entry></row><row><entry align="left">tx-power</entry><entry align="left">(none)</entry><entry align="left"/><entry align="left">This property is not handled by ifcfg-rh plugin.</entry></row><row><entry align="left">mac-address</entry><entry align="left">HWADDR</entry><entry align="left"/><entry align="left">Hardware address of the device in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:05).</entry></row><row><entry align="left">cloned-mac-address</entry><entry align="left">MACADDR</entry><entry align="left"/><entry align="left">Cloned (spoofed) MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:99).</entry></row><row><entry align="left">mac-address-blacklist</entry><entry align="left">HWADDR_BLACKLIST<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">It denies usage of the connection for any device whose address is listed.</entry></row><row><entry align="left">seen-bssids</entry><entry align="left">(none)</entry><entry align="left"/><entry align="left">This property is not handled by ifcfg-rh plugin.</entry></row><row><entry align="left">mtu</entry><entry align="left">MTU</entry><entry align="left"/><entry align="left">MTU of the wireless interface.</entry></row><row><entry align="left">hidden</entry><entry align="left">SSID_HIDDEN<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">Whether the network hides the SSID.</entry></row><row><entry align="left">powersave</entry><entry align="left">POWERSAVE<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">Enables or disables Wi-Fi power saving.<emphasis role="bold"> + +Example: </emphasis>POWERSAVE=enable<emphasis role="bold"> -Example: </emphasis>POWERSAVE=yes</entry></row><row><entry align="left">mac-address-randomization</entry><entry align="left">MAC_ADDRESS_RANDOMIZATION<emphasis>(+)</emphasis></entry><entry align="left">1</entry><entry align="left">Enables or disables Wi-Fi MAC address randomization.<emphasis role="bold"> +Allowed values: </emphasis>default, ignore, enable, disable</entry></row><row><entry align="left">mac-address-randomization</entry><entry align="left">MAC_ADDRESS_RANDOMIZATION<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">Enables or disables Wi-Fi MAC address randomization.<emphasis role="bold"> -Example: </emphasis>MAC_ADDRESS_RANDOMIZATION=2<emphasis role="bold"> +Example: </emphasis>MAC_ADDRESS_RANDOMIZATION=always<emphasis role="bold"> -Allowed values: </emphasis>0 (default), (1) never, (2) always</entry></row><row><entry align="left">security</entry><entry align="left">(none)</entry><entry align="left"/><entry align="left">This property is deprecated and not handled by ifcfg-rh-plugin.</entry></row></tbody></tgroup></table><para>The following settings are not supported by <emphasis>ifcfg-rh</emphasis> plugin:</para><para>adsl, bluetooth, ppp, pppoe, serial, generic, gsm, cdma, 802-11-olpc-mesh, wimax, vpn</para><refsect2 id="secrets-flags"><title>Secret flags</title><para> +Allowed values: </emphasis>default, never, always</entry></row><row><entry align="left">security</entry><entry align="left">(none)</entry><entry align="left"/><entry align="left">This property is deprecated and not handled by ifcfg-rh-plugin.</entry></row></tbody></tgroup></table><para>The following settings are not supported by <emphasis>ifcfg-rh</emphasis> plugin:</para><para>adsl, bluetooth, ppp, pppoe, serial, generic, gsm, cdma, 802-11-olpc-mesh, wimax, vpn</para><refsect2 id="secrets-flags"><title>Secret flags</title><para> Each secret property in a NetworkManager setting has an associated <emphasis>flags</emphasis> property that describes how to handle that secret. In the <emphasis>fcfg-rh</emphasis> plugin variables for secret flags have a diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index af246bb7..eddeec0d 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 19 January 2016 +.\" Date: 01 March 2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.1.90 +.\" Source: NetworkManager 1.1.91 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.1\&.90" "Configuration" +.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.1\&.91" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index bf666b7c..7e210548 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> -<refentry id="nm-settings-keyfile"><refentryinfo><date>19 January 2016</date></refentryinfo><refmeta><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.90</refmiscinfo></refmeta><refnamediv><refname>nm-settings-keyfile</refname><refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose></refnamediv><refsect1><title>DESCRIPTION</title><para> +<refentry id="nm-settings-keyfile"><refentryinfo><date>01 March 2016</date></refentryinfo><refmeta><refentrytitle>nm-settings-keyfile</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.91</refmiscinfo></refmeta><refnamediv><refname>nm-settings-keyfile</refname><refpurpose>Description of <emphasis>keyfile</emphasis> settings plugin</refpurpose></refnamediv><refsect1><title>DESCRIPTION</title><para> NetworkManager is based on the concept of connection profiles that contain network configuration (see <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings.5 b/man/nm-settings.5 index bee66154..d1e15a07 100644 --- a/man/nm-settings.5 +++ b/man/nm-settings.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 19 January 2016 +.\" Date: 01 March 2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.1.90 +.\" Source: NetworkManager 1.1.91 .\" Language: English .\" -.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.1\&.90" "Configuration" +.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.1\&.91" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1548,6 +1548,7 @@ l l l l l l l l l l l l l l l l +l l l l l l l l. T{ address\-data @@ -1568,6 +1569,15 @@ T}:T{ Deprecated in favor of the \*(Aqaddress\-data\*(Aq and \*(Aqgateway\*(Aq properties, but this can be used for backward\-compatibility with older daemons\&. Note that if you send this property the daemon will ignore \*(Aqaddress\-data\*(Aq and \*(Aqgateway\*(Aq\&. Array of IPv4 address structures\&. Each IPv4 address structure is composed of 3 32\-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 \- 32), and last the IPv4 gateway (network byte order)\&. The gateway may be left as 0 if no gateway exists for that subnet\&. T} T{ +dad\-timeout +T}:T{ +int32 +T}:T{ +\-1 +T}:T{ +Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network\&. If an address conflict is detected, the activation will fail\&. A zero value means that no duplicate address detection is performed, \-1 means the default value (either configuration ipvx\&.dad\-timeout override or 3 seconds)\&. A value greater than zero is a timeout in milliseconds\&. +T} +T{ dhcp\-client\-id T}:T{ string @@ -1606,7 +1616,7 @@ T} T{ dhcp\-timeout T}:T{ -uint32 +int32 T}:T{ 0 T}:T{ @@ -1768,6 +1778,8 @@ l l l l l l l l l l l l l l l l +l l l l +l l l l l l l l. T{ addr\-gen\-mode @@ -1797,6 +1809,15 @@ T}:T{ Deprecated in favor of the \*(Aqaddress\-data\*(Aq and \*(Aqgateway\*(Aq properties, but this can be used for backward\-compatibility with older daemons\&. Note that if you send this property the daemon will ignore \*(Aqaddress\-data\*(Aq and \*(Aqgateway\*(Aq\&. Array of IPv6 address structures\&. Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 \- 128), and an IPv6 gateway address\&. The gateway may be zeroed out if no gateway exists for that subnet\&. T} T{ +dad\-timeout +T}:T{ +int32 +T}:T{ +\-1 +T}:T{ +Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network\&. If an address conflict is detected, the activation will fail\&. A zero value means that no duplicate address detection is performed, \-1 means the default value (either configuration ipvx\&.dad\-timeout override or 3 seconds)\&. A value greater than zero is a timeout in milliseconds\&. +T} +T{ dhcp\-hostname T}:T{ string @@ -1815,6 +1836,15 @@ T}:T{ If TRUE, a hostname is sent to the DHCP server when acquiring a lease\&. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer\&. If the "dhcp\-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent\&. T} T{ +dhcp\-timeout +T}:T{ +int32 +T}:T{ +0 +T}:T{ +A timeout for a DHCP transaction in seconds\&. +T} +T{ dns T}:T{ array of byte array @@ -2822,7 +2852,7 @@ uint32 T}:T{ 0 T}:T{ -The VLAN identifier that the interface created by this connection should be assigned\&. +The VLAN identifier that the interface created by this connection should be assigned\&. The valid range is from 0 to 4094, without the reserved id 4095\&. T} T{ ingress\-priority\-map @@ -2994,7 +3024,7 @@ ageing T}:T{ uint32 T}:T{ -0 +300 T}:T{ Specifies the lifetime in seconds of FDB entries learnt by the kernel\&. T} @@ -3498,7 +3528,7 @@ uint32 T}:T{ 0 T}:T{ -If set to FALSE, Wi\-Fi power saving behavior is disabled\&. If set to TRUE, Wi\-Fi power saving behavior is enabled\&. All other values are reserved\&. Note that even though only boolean values are allowed, the property type is an unsigned integer to allow for future expansion\&. +One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi\-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi\-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don\*(Aqt touch currently configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the globally configured value)\&. All other values are reserved\&. T} T{ rate diff --git a/man/nm-settings.xml b/man/nm-settings.xml index 2a8ee9f9..d38b24a6 100644 --- a/man/nm-settings.xml +++ b/man/nm-settings.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> -<refentry id="nm-settings"><refentryinfo><date>19 January 2016</date></refentryinfo><refmeta><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.90</refmiscinfo></refmeta><refnamediv><refname>nm-settings</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles</refpurpose></refnamediv><refsect1><title>DESCRIPTION</title><para> +<refentry id="nm-settings"><refentryinfo><date>01 March 2016</date></refentryinfo><refmeta><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.1.91</refmiscinfo></refmeta><refnamediv><refname>nm-settings</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles</refpurpose></refnamediv><refsect1><title>DESCRIPTION</title><para> NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will @@ -180,11 +180,12 @@ <table><title>ipv4 setting</title><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody> <row><entry align="left">address-data</entry><entry align="left">array of vardict</entry><entry align="left"/><entry>Array of IPv4 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.</entry></row> <row><entry align="left">addresses</entry><entry align="left">array of array of uint32</entry><entry align="left">[]</entry><entry>Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'. Array of IPv4 address structures. Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.</entry></row> + <row><entry align="left">dad-timeout</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds). A value greater than zero is a timeout in milliseconds.</entry></row> <row><entry align="left">dhcp-client-id</entry><entry align="left">string</entry><entry align="left"/><entry>A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options.</entry></row> <row><entry align="left">dhcp-fqdn</entry><entry align="left">string</entry><entry align="left"/><entry>If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.</entry></row> <row><entry align="left">dhcp-hostname</entry><entry align="left">string</entry><entry align="left"/><entry>If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.</entry></row> <row><entry align="left">dhcp-send-hostname</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry>If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.</entry></row> - <row><entry align="left">dhcp-timeout</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>A timeout for a DHCP transaction in seconds.</entry></row> + <row><entry align="left">dhcp-timeout</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>A timeout for a DHCP transaction in seconds.</entry></row> <row><entry align="left">dns</entry><entry align="left">array of uint32</entry><entry align="left">[]</entry><entry>Array of IP addresses of DNS servers (as network-byte-order integers)</entry></row> <row><entry align="left">dns-options</entry><entry align="left">array of string</entry><entry align="left">[]</entry><entry>Array of DNS options. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.</entry></row> <row><entry align="left">dns-search</entry><entry align="left">array of string</entry><entry align="left">[]</entry><entry>Array of DNS search domains.</entry></row> @@ -203,8 +204,10 @@ <row><entry align="left">addr-gen-mode</entry><entry align="left">int32</entry><entry align="left">1</entry><entry>Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", "stable-privacy" or unset. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.</entry></row> <row><entry align="left">address-data</entry><entry align="left">array of vardict</entry><entry align="left"/><entry>Array of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.</entry></row> <row><entry align="left">addresses</entry><entry align="left">array of legacy IPv6 address struct (a(ayuay))</entry><entry align="left">[]</entry><entry>Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'. Array of IPv6 address structures. Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.</entry></row> + <row><entry align="left">dad-timeout</entry><entry align="left">int32</entry><entry align="left">-1</entry><entry>Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds). A value greater than zero is a timeout in milliseconds.</entry></row> <row><entry align="left">dhcp-hostname</entry><entry align="left">string</entry><entry align="left"/><entry>If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.</entry></row> <row><entry align="left">dhcp-send-hostname</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry>If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the "dhcp-hostname" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.</entry></row> + <row><entry align="left">dhcp-timeout</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>A timeout for a DHCP transaction in seconds.</entry></row> <row><entry align="left">dns</entry><entry align="left">array of byte array</entry><entry align="left">[]</entry><entry>Array of IP addresses of DNS servers (in network byte order)</entry></row> <row><entry align="left">dns-options</entry><entry align="left">array of string</entry><entry align="left">[]</entry><entry>Array of DNS options. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.</entry></row> <row><entry align="left">dns-search</entry><entry align="left">array of string</entry><entry align="left">[]</entry><entry>Array of DNS search domains.</entry></row> @@ -305,7 +308,7 @@ <table><title>vlan setting</title><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody> <row><entry align="left">egress-priority-map</entry><entry align="left">array of string</entry><entry align="left">[]</entry><entry>For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities. The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".</entry></row> <row><entry align="left">flags</entry><entry align="left">NMVlanFlags (uint32)</entry><entry align="left"/><entry>One or more flags which control the behavior and features of the VLAN interface. Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of output packet headers), NM_VLAN_FLAG_GVRP (0x2) (use of the GVRP protocol), and NM_VLAN_FLAG_LOOSE_BINDING (0x4) (loose binding of the interface to its master device's operating state). NM_VLAN_FLAG_MVRP (0x8) (use of the MVRP protocol). The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.</entry></row> - <row><entry align="left">id</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>The VLAN identifier that the interface created by this connection should be assigned.</entry></row> + <row><entry align="left">id</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>The VLAN identifier that the interface created by this connection should be assigned. The valid range is from 0 to 4094, without the reserved id 4095.</entry></row> <row><entry align="left">ingress-priority-map</entry><entry align="left">array of string</entry><entry align="left">[]</entry><entry>For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities. The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".</entry></row> <row><entry align="left">interface-name</entry><entry align="left">string</entry><entry align="left"/><entry>Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the vlan's interface name.</entry></row> <row><entry align="left">name</entry><entry align="left">string</entry><entry align="left">vlan</entry><entry>The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired".</entry></row> @@ -321,7 +324,7 @@ <row><entry align="left">user-name</entry><entry align="left">string</entry><entry align="left"/><entry>If the VPN connection requires a user name for authentication, that name should be provided here. If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty. If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.</entry></row> </tbody></tgroup></table> <table><title>vxlan setting</title><tgroup cols="4"><thead><row><entry>Key Name</entry><entry>Value Type</entry><entry>Default Value</entry><entry>Value Description</entry></row></thead><tbody> - <row><entry align="left">ageing</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>Specifies the lifetime in seconds of FDB entries learnt by the kernel.</entry></row> + <row><entry align="left">ageing</entry><entry align="left">uint32</entry><entry align="left">300</entry><entry>Specifies the lifetime in seconds of FDB entries learnt by the kernel.</entry></row> <row><entry align="left">destination-port</entry><entry align="left">uint32</entry><entry align="left">8472</entry><entry>Specifies the UDP destination port to communicate to the remote VXLAN tunnel endpoint.</entry></row> <row><entry align="left">id</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>Specifies the VXLAN Network Identifer (or VXLAN Segment Identifier) to use.</entry></row> <row><entry align="left">l2-miss</entry><entry align="left">boolean</entry><entry align="left">FALSE</entry><entry>Specifies whether netlink LL ADDR miss notifications are generated.</entry></row> @@ -372,7 +375,7 @@ <row><entry align="left">mode</entry><entry align="left">string</entry><entry align="left"/><entry>Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap". If blank, infrastructure is assumed.</entry></row> <row><entry align="left">mtu</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.</entry></row> <row><entry align="left">name</entry><entry align="left">string</entry><entry align="left">802-11-wireless</entry><entry>The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired".</entry></row> - <row><entry align="left">powersave</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>If set to FALSE, Wi-Fi power saving behavior is disabled. If set to TRUE, Wi-Fi power saving behavior is enabled. All other values are reserved. Note that even though only boolean values are allowed, the property type is an unsigned integer to allow for future expansion.</entry></row> + <row><entry align="left">powersave</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the globally configured value). All other values are reserved.</entry></row> <row><entry align="left">rate</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>If non-zero, directs the device to only use the specified bitrate for communication with the access point. Units are in Kb/s, ie 5500 = 5.5 Mbit/s. This property is highly driver dependent and not all devices support setting a static bitrate.</entry></row> <row><entry align="left">security</entry><entry align="left">None</entry><entry align="left"/><entry>This property is deprecated, but can be set to the value '802-11-wireless-security' when a wireless security setting is also present in the connection dictionary, for compatibility with very old NetworkManager daemons.</entry></row> <row><entry align="left">seen-bssids</entry><entry align="left">array of string</entry><entry align="left">[]</entry><entry>A list of BSSIDs (each BSSID formatted as a MAC address like "00:11:22:33:44:55") that have been detected as part of the Wi-Fi network. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BSSID list of NetworkManager. The changes you make to this property will not be preserved.</entry></row> diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml index a0da09cc..d4ba7172 100644 --- a/man/nmcli-examples.xml +++ b/man/nmcli-examples.xml @@ -284,20 +284,20 @@ export LC_ALL=C enable_disable_wifi () { - result=$(nmcli dev | grep "ethernet" | grep -w "connected") - if [ -n "$result" ]; then - nmcli radio wifi off - else - nmcli radio wifi on - fi + result=$(nmcli dev | grep "ethernet" | grep -w "connected") + if [ -n "$result" ]; then + nmcli radio wifi off + else + nmcli radio wifi on + fi } if [ "$2" = "up" ]; then - enable_disable_wifi + enable_disable_wifi fi if [ "$2" = "down" ]; then - enable_disable_wifi + enable_disable_wifi fi </programlisting> </example> |