diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/Makefile.in | 2 | ||||
| -rw-r--r-- | man/NetworkManager.8 | 15 | ||||
| -rw-r--r-- | man/NetworkManager.conf.5 | 222 | ||||
| -rw-r--r-- | man/NetworkManager.conf.xml.in | 224 | ||||
| -rw-r--r-- | man/nm-settings-ifcfg-rh.5 | 16 | ||||
| -rw-r--r-- | man/nm-settings-ifcfg-rh.xml | 4 | ||||
| -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 | 20 | ||||
| -rw-r--r-- | man/nm-settings.xml | 7 | ||||
| -rw-r--r-- | man/nmcli.1.in | 11 |
11 files changed, 462 insertions, 67 deletions
diff --git a/man/Makefile.in b/man/Makefile.in index 01a94a34..d62aa0f8 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -186,6 +186,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -299,6 +300,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index 9f8840d0..6896f941 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,7 +2,7 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 05/05/2015 +.\" Date: 07/14/2015 .\" Manual: Network management daemons .\" Source: NetworkManager 1.0 .\" Language: English @@ -239,6 +239,17 @@ in \fBNetworkManager.conf\fR(5) for more information\&. .RE +.SH "UDEV PROPERTIES" +.PP +\fBudev\fR(7) +device manager is used for the network device discovery\&. The following property influences how NetworkManager manages the devices: +.PP +\fINM_UNMANAGED\fR +.RS 4 +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\&. +.sp +Create an udev rule that sets this property to prevent NetworkManager from interfering with virtual Ethernet device interfaces that are managed by virtualization tools\&. +.RE .SH "DEBUGGING" .PP The following environment variables are supported to help debugging\&. When used in conjunction with the @@ -258,4 +269,4 @@ to enable debug logging inside NetworkManager itself\&. \fBnm-online\fR(1), \fBnm-settings\fR(5), \fBnm-applet\fR(1), -\fBnm-connection-editor\fR(1) +\fBnm-connection-editor\fR(1)\fBudev\fR(7) diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 9cfcc93f..ae18f4f6 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,7 +2,7 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 05/05/2015 +.\" Date: 07/14/2015 .\" Manual: Configuration .\" Source: NetworkManager 1.0 .\" Language: English @@ -50,7 +50,9 @@ directory\&. These will be read in order, with later files overriding earlier on .PP The configuration file format is so\-called key file (sort of ini\-style format)\&. It consists of sections (groups) of key\-value pairs\&. Lines beginning with a \*(Aq#\*(Aq and blank lines are considered comments\&. Sections are started by a header line containing the section enclosed in \*(Aq[\*(Aq and \*(Aq]\*(Aq, and ended implicitly by the start of the next section or the end of the file\&. Each key\-value pair must be contained in a section\&. .PP -For keys that take a list of devices as their value, you can specify devices by their MAC addresses or interface names, or "*" to specify all devices\&. +For keys that take a list of devices as their value, you can specify devices by their MAC addresses or interface names, or "*" to specify all devices\&. See +the section called \(lqDevice List Format\(rq +below\&. .PP Minimal system settings configuration file looks like this: .sp @@ -73,6 +75,7 @@ As an extension to the normal keyfile format, you can also append a value to a p .\} .nf plugins+=another\-plugin + plugins\-=remove\-me .fi .if n \{\ @@ -125,7 +128,7 @@ internal\&. .PP \fIno\-auto\-default\fR .RS 4 -Comma\-separated list of devices for which NetworkManager shouldn\*(Aqt create default wired connection (Auto eth0)\&. By default, NetworkManager creates a temporary wired connection for any Ethernet device that is managed and doesn\*(Aqt have a connection configured\&. List a device in this option to inhibit creating the default connection for the device\&. May have the special value +Specify devices for which NetworkManager shouldn\*(Aqt create default wired connection (Auto eth0)\&. By default, NetworkManager creates a temporary wired connection for any Ethernet device that is managed and doesn\*(Aqt have a connection configured\&. List a device in this option to inhibit creating the default connection for the device\&. May have the special value * to apply to all devices\&. .sp @@ -133,13 +136,19 @@ When the default wired connection is deleted or saved to a new persistent connec /var/run/NetworkManager/no\-auto\-default\&.state to prevent creating the default connection for that device again\&. .sp +See +the section called \(lqDevice List Format\(rq +for the syntax how to specify a device\&. +.sp +Example: +.sp .if n \{\ .RS 4 .\} .nf - no\-auto\-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee - no\-auto\-default=eth0,eth1 - no\-auto\-default=* +no\-auto\-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee +no\-auto\-default=eth0,eth1 +no\-auto\-default=* .fi .if n \{\ @@ -150,15 +159,24 @@ to prevent creating the default connection for that device again\&. .PP \fIignore\-carrier\fR .RS 4 -Comma\-separated list of 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\&. +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\&. .sp 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\&. .sp -May have the special value -* -to apply to all devices\&. -.sp Note that the "carrier" property of NMDevices and device D\-Bus interfaces will still reflect the actual device state; it\*(Aqs just that NetworkManager will not make use of that information\&. +.sp +See +the section called \(lqDevice List Format\(rq +for the syntax how to specify a device\&. +.RE +.PP +\fIassume\-ipv6ll\-only\fR +.RS 4 +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\&. +.sp +See +the section called \(lqDevice List Format\(rq +for the syntax how to specify a device\&. .RE .PP \fIconfigure\-and\-quit\fR @@ -205,19 +223,11 @@ Set a persistent hostname\&. .PP \fIunmanaged\-devices\fR .RS 4 -Set devices that should be ignored by NetworkManager when using the -keyfile -plugin\&. Devices are specified in the following format: +Set devices that should be ignored by NetworkManager\&. .sp -mac:<hwaddr> -or -interface\-name:<ifname>\&. Here -hwaddr -is the MAC address of the device to be ignored, in hex\-digits\-and\-colons notation\&. -ifname -is the interface name of the ignored device\&. -.sp -Multiple entries are separated with semicolons\&. No spaces are allowed in the value\&. +See +the section called \(lqDevice List Format\(rq +for the syntax how to specify a device\&. .sp Example: .sp @@ -415,6 +425,86 @@ IP : shortcut for "IP4,IP6" HW : deprecated alias for "PLATFORM" .RE .RE +.SH "CONNECTION SECTION" +.PP +This section allows to specify default values for connections\&. Not all properties can be overwritten, only a selected list below\&. You can have multiple +connection +sections, by having different sections with a name that all start with "connection"\&. +.PP +Example: +.sp +.if n \{\ +.RS 4 +.\} +.nf +[connection] +ipv6\&.ip6\-privacy=0 +connection\&.autoconnect\-slaves=1 + +[connection\-wifi\-wlan0] +match\-device=interface\-name:wlan0 +ipv4\&.route\-metric=50 + +[connection\-wifi\-other] +match\-device=type:wifi +ipv4\&.route\-metric=55 +ipv6\&.ip6\-privacy=1 +.fi +.if n \{\ +.RE +.\} +.PP +The sections within one file are considered in order of appearance, with the exception that the +[connection] +section is always considered last\&. In the example above, this order is +[connection\-wifi\-wlan0], +[connection\-wlan\-other], and +[connection]\&. When checking for a default configuration value, the section 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 IPv6 private addresses enabled by default, but other devices would have it disabled\&. Note that also "wlan0" gets "ipv6\&.ip6\-privacy=1", because although the section "[connection\-wifi\-wlan0]" matches the device, it does not contain that property and the search continues\&. +.PP +When having different sections in multiple files, sections from files that are read later have higher priority\&. So within one file the priority of the sections is top\-to\-bottom\&. Across multiple files later definitions take precedence\&. +.PP +.PP +\fImatch\-device\fR +.RS 4 +An optional device spec that restricts when the section applies\&. See +the section called \(lqDevice List Format\(rq +for the possible values\&. +.RE +.PP +\fIstop\-match\fR +.RS 4 +An optional boolean value which defaults to +no\&. If the section matches (based on +match\-device), further sections will not be considered even if the property in question is not present\&. In the example above, if +[connection\-wifi\-wlan0] +would have +stop\-match +set to +yes, its +ipv6\&.ip6\-privacy +value would be unspecified\&. +.RE +.PP +The following properties are supported to have their default values configured: +.PP +\fIipv4\&.route\-metric\fR +.RS 4 +.RE +.PP +\fIipv6\&.ip6\-privacy\fR +.RS 4 +If +ipv6\&.ip6\-privacy +is unset, use the content of "/proc/sys/net/ipv6/conf/default/use_tempaddr" as last fallback\&. +.RE +.PP +\fIipv6\&.route\-metric\fR +.RS 4 +.RE +.PP +\fIconnection\&.autoconnect\-slaves\fR +.RS 4 +.RE .SH "CONNECTIVITY SECTION" .PP This section controls NetworkManager\*(Aqs optional connectivity checking functionality\&. This allows NetworkManager to detect whether or not the system can actually access the internet or whether it is behind a captive portal\&. @@ -479,6 +569,92 @@ plugin instead\&. .RS 4 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\&. .RE +.SH "APPENDIX" +.SS "Device List Format" +.PP +The configuration options +main\&.no\-auto\-default, +main\&.ignore\-carrier, and +keyfile\&.unmanaged\-devices +select devices based on a list of matchings\&. Devices can be specified using the following format: +.PP +.PP +* +.RS 4 +Matches every device\&. +.RE +.PP +IFNAME +.RS 4 +Case sensitive match of interface name of the device\&. Globbing is not supported\&. +.RE +.PP +HWADDR +.RS 4 +Match the MAC address of the device\&. Globbing is not supported +.RE +.PP +interface\-name:IFNAME, interface\-name:~IFNAME +.RS 4 +Case sensitive match of interface name of the device\&. Simple globbing is supported with +* +and +?\&. Ranges and escaping is not supported\&. +.RE +.PP +interface\-name:=IFNAME +.RS 4 +Case sensitive match of interface name of the device\&. Globbing is disabled and +IFNAME +is taken literally\&. +.RE +.PP +mac:HWADDR +.RS 4 +Match the MAC address of the device\&. Globbing is not supported +.RE +.PP +s390\-subchannels:HWADDR +.RS 4 +Match the device based on the subchannel address\&. Globbing is not supported +.RE +.PP +type:TYPE +.RS 4 +Match the device type\&. Valid type names are as reported by "nmcli \-f GENERAL\&.TYPE device show"\&. Globbing is not supported\&. +.RE +.PP +except:SPEC +.RS 4 +Negative match of a device\&. +SPEC +must be explicitly qualified with a prefix such as +interface\-name:\&. A negative match has higher priority then the positive matches above\&. +.RE +.PP +SPEC[,;]SPEC +.RS 4 +Multiple specs can be concatenated with comman or semicolon\&. The order does not matter as matches are either positive (inclusive) or negative, with negative matches having higher priority\&. +.sp +Backslash is supported to escape the separators \*(Aq;\*(Aq and \*(Aq,\*(Aq, and to express special characters such as newline (\*(Aq\en\*(Aq), tabulator (\*(Aq\et\*(Aq), whitespace (\*(Aq\es\*(Aq) and backslash (\*(Aq\e\e\*(Aq)\&. The globbing of interface names cannot be escaped\&. Whitespace is taken literally so usually the specs will be concatenated without spaces\&. +.RE +.PP +Example: +.sp +.if n \{\ +.RS 4 +.\} +.nf +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 + +.fi +.if n \{\ +.RE +.\} +.sp .SH "SEE ALSO" .PP \fBNetworkManager\fR(8), diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in index 7c6b9551..40fa49dd 100644 --- a/man/NetworkManager.conf.xml.in +++ b/man/NetworkManager.conf.xml.in @@ -62,7 +62,8 @@ Copyright 2010 - 2014 Red Hat, Inc. <para> For keys that take a list of devices as their value, you can specify devices by their MAC addresses or interface names, or - "*" to specify all devices. + "*" to specify all devices. See <xref linkend="device-spec"/> + below. </para> <para> Minimal system settings configuration file looks like this: @@ -76,6 +77,7 @@ Copyright 2010 - 2014 Red Hat, Inc. append a value to a previously-set list-valued key by doing: <programlisting> plugins+=another-plugin + plugins-=remove-me </programlisting> </para> </refsect1> @@ -148,7 +150,7 @@ Copyright 2010 - 2014 Red Hat, Inc. </varlistentry> <varlistentry> <term><varname>no-auto-default</varname></term> - <listitem><para>Comma-separated list of devices for which + <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 @@ -162,11 +164,15 @@ Copyright 2010 - 2014 Red Hat, Inc. <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=* +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> @@ -176,8 +182,8 @@ Copyright 2010 - 2014 Red Hat, Inc. <term><varname>ignore-carrier</varname></term> <listitem> <para> - Comma-separated list of devices for which NetworkManager - will (partially) ignore the carrier state. Normally, for + 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 @@ -194,14 +200,27 @@ Copyright 2010 - 2014 Red Hat, Inc. the device when carrier is lost. </para> <para> - May have the special value <literal>*</literal> to apply - to all devices. - </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> </varlistentry> @@ -287,17 +306,11 @@ Copyright 2010 - 2014 Red Hat, Inc. <varlistentry> <term><varname>unmanaged-devices</varname></term> <listitem><para>Set devices that should be ignored by - NetworkManager when using the <literal>keyfile</literal> - plugin. Devices are specified in the following - format:</para> - <para><literal>mac:<hwaddr></literal> or - <literal>interface-name:<ifname></literal>. Here - <literal>hwaddr</literal> is the MAC address of the device - to be ignored, in hex-digits-and-colons notation. - <literal>ifname</literal> is the interface name of the - ignored device.</para> - <para>Multiple entries are separated with semicolons. No - spaces are allowed in the value.</para> + NetworkManager. + </para> + <para>See <xref linkend="device-spec"/> for the syntax how to + specify a device. + </para> <para> Example: <programlisting> @@ -429,6 +442,97 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth </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> + Example: +<programlisting> +[connection] +ipv6.ip6-privacy=0 +connection.autoconnect-slaves=1 + +[connection-wifi-wlan0] +match-device=interface-name:wlan0 +ipv4.route-metric=50 + +[connection-wifi-other] +match-device=type:wifi +ipv4.route-metric=55 +ipv6.ip6-privacy=1 +</programlisting> + </para> + + <para> + The sections within one file are considered in order of appearance, with the + 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 + 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 + IPv6 private addresses enabled by default, but other devices would have it disabled. + Note that also "wlan0" gets "ipv6.ip6-privacy=1", because although the section + "[connection-wifi-wlan0]" matches the device, it does not contain that property + and the search continues. + </para> + <para> + When having different sections in multiple files, sections from files that are read + later have higher priority. So within one file the priority of the sections is + top-to-bottom. Across multiple files later definitions take precedence. + </para> + + <para> + <variablelist> + <varlistentry> + <term><varname>match-device</varname></term> + <listitem><para>An optional device spec that restricts + when the section applies. See <xref linkend="device-spec"/> + for the possible values. + </para></listitem> + </varlistentry> + <varlistentry> + <term><varname>stop-match</varname></term> + <listitem><para>An optional boolean value which defaults to + <literal>no</literal>. If the section matches (based on + <literal>match-device</literal>), further sections will not be + considered even if the property in question is not present. In + the example above, if <literal>[connection-wifi-wlan0]</literal> would + have <literal>stop-match</literal> set to <literal>yes</literal>, + its <literal>ipv6.ip6-privacy</literal> value would be + unspecified. + </para></listitem> + </varlistentry> + </variablelist> + </para> + + <para> + The following properties are supported to have their default values configured: + <variablelist> + <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>connection.autoconnect-slaves</varname></term> + </varlistentry> + </variablelist> + </para> + </refsect1> + + <refsect1> <title><literal>connectivity</literal> section</title> <para>This section controls NetworkManager's optional connectivity checking functionality. This allows NetworkManager to detect @@ -554,6 +658,82 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth </refsect1> <refsect1> + <title>Appendix</title> + <refsect2 id="device-spec"> + <title>Device List Format</title> + <para> + The configuration options <literal>main.no-auto-default</literal>, <literal>main.ignore-carrier</literal>, + and <literal>keyfile.unmanaged-devices</literal> select devices based on a list of matchings. + Devices can be specified using the following format: + </para> + <para> + <variablelist> + <varlistentry> + <term>*</term> + <listitem><para>Matches every device.</para></listitem> + </varlistentry> + <varlistentry> + <term>IFNAME</term> + <listitem><para>Case sensitive match of interface name of the device. Globbing is not supported.</para></listitem> + </varlistentry> + <varlistentry> + <term>HWADDR</term> + <listitem><para>Match the MAC address of the device. Globbing is not supported</para></listitem> + </varlistentry> + <varlistentry> + <term>interface-name:IFNAME</term> + <term>interface-name:~IFNAME</term> + <listitem><para>Case sensitive match of interface name of the device. Simple globbing is supported with + <literal>*</literal> and <literal>?</literal>. Ranges and escaping is not supported.</para></listitem> + </varlistentry> + <varlistentry> + <term>interface-name:=IFNAME</term> + <listitem><para>Case sensitive match of interface name of the device. Globbing is disabled and <literal>IFNAME</literal> + is taken literally.</para></listitem> + </varlistentry> + <varlistentry> + <term>mac:HWADDR</term> + <listitem><para>Match the MAC address of the device. Globbing is not supported</para></listitem> + </varlistentry> + <varlistentry> + <term>s390-subchannels:HWADDR</term> + <listitem><para>Match the device based on the subchannel address. Globbing is not supported</para></listitem> + </varlistentry> + <varlistentry> + <term>type:TYPE</term> + <listitem><para>Match the device type. Valid type names are as reported by "<literal>nmcli -f GENERAL.TYPE device show</literal>". + Globbing is not supported.</para></listitem> + </varlistentry> + <varlistentry> + <term>except:SPEC</term> + <listitem><para>Negative match of a device. <literal>SPEC</literal> must be explicitly qualified with + a prefix such as <literal>interface-name:</literal>. A negative match has higher priority then the positive + matches above.</para></listitem> + </varlistentry> + <varlistentry> + <term>SPEC[,;]SPEC</term> + <listitem><para>Multiple specs can be concatenated with comman or semicolon. The order does not matter as + matches are either positive (inclusive) or negative, with negative matches having higher priority.</para> + <para>Backslash is supported to escape the separators ';' and ',', and to express special + characters such as newline ('\n'), tabulator ('\t'), whitespace ('\s') and backslash ('\\'). The globbing of + interface names cannot be escaped. Whitespace is taken literally so usually the specs will be concatenated + without spaces.</para></listitem> + </varlistentry> + </variablelist> + </para> + <para> + Example: + <programlisting> +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> + </para> + </refsect2> + </refsect1> + + <refsect1> <title>See Also</title> <para> <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>, diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index 6d394e91..e31d9a9d 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: 05 May 2015 +.\" Date: 14 July 2015 .\" Manual: Configuration -.\" Source: NetworkManager 1.0.2 +.\" Source: NetworkManager 1.0.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.0\&.2" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.0\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -897,6 +897,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{ id @@ -1001,6 +1002,15 @@ T}:T{ Slave type doesn\*(Aqt map directly to a variable, but it is recognized using different variables\&. MASTER for bonding, TEAM_MASTER and DEVICETYPE for teaming, BRIDGE for bridging\&. T} T{ +autoconnect\-slaves +T}:T{ +AUTOCONNECT\-SLAVES\fI(+)\fR +T}:T{ +missing variable means global default +T}:T{ +Whether slaves of this connection should be auto\-connected when this connection is activated\&. +T} +T{ secondaries T}:T{ SECONDARY_UUIDS\fI(+)\fR diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index 362bd68b..7146cb43 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>05 May 2015</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.0.2</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>14 July 2015</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.0.4</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 @@ -233,7 +233,7 @@ Example: </emphasis>AUTOCONNECT_PRIORITY=20<emphasis role="bold"> Allowed values: </emphasis>-999 to 999</entry></row><row><entry align="left">zone</entry><entry align="left">ZONE<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">Trust level of this connection. The string is usually used for a firewall.<emphasis role="bold"> -Example: </emphasis>ZONE=Work</entry></row><row><entry align="left">master</entry><entry align="left">MASTER, TEAM_MASTER, BRIDGE</entry><entry align="left"/><entry align="left">Reference to master connection. The variable used depends on the connection type.</entry></row><row><entry align="left">slave-type</entry><entry align="left">MASTER, TEAM_MASTER, DEVICETYPE, BRIDGE</entry><entry align="left"/><entry align="left">Slave type doesn't map directly to a variable, but it is recognized using different variables. MASTER for bonding, TEAM_MASTER and DEVICETYPE for teaming, BRIDGE for bridging.</entry></row><row><entry align="left">secondaries</entry><entry align="left">SECONDARY_UUIDS<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">UUID of VPN connections that should be activated together with this connection.</entry></row><row><entry align="left">gateway-ping-timeout</entry><entry align="left">GATEWAY_PING_TIMEOUT<emphasis>(+)</emphasis></entry><entry align="left">0</entry><entry align="left">If greater than zero, the IP connectivity will be checked by pinging the gateway and waiting for the specified timeout (in seconds).<emphasis role="bold"> +Example: </emphasis>ZONE=Work</entry></row><row><entry align="left">master</entry><entry align="left">MASTER, TEAM_MASTER, BRIDGE</entry><entry align="left"/><entry align="left">Reference to master connection. The variable used depends on the connection type.</entry></row><row><entry align="left">slave-type</entry><entry align="left">MASTER, TEAM_MASTER, DEVICETYPE, BRIDGE</entry><entry align="left"/><entry align="left">Slave type doesn't map directly to a variable, but it is recognized using different variables. MASTER for bonding, TEAM_MASTER and DEVICETYPE for teaming, BRIDGE for bridging.</entry></row><row><entry align="left">autoconnect-slaves</entry><entry align="left">AUTOCONNECT-SLAVES<emphasis>(+)</emphasis></entry><entry align="left">missing variable means global default</entry><entry align="left">Whether slaves of this connection should be auto-connected when this connection is activated.</entry></row><row><entry align="left">secondaries</entry><entry align="left">SECONDARY_UUIDS<emphasis>(+)</emphasis></entry><entry align="left"/><entry align="left">UUID of VPN connections that should be activated together with this connection.</entry></row><row><entry align="left">gateway-ping-timeout</entry><entry align="left">GATEWAY_PING_TIMEOUT<emphasis>(+)</emphasis></entry><entry align="left">0</entry><entry align="left">If greater than zero, the IP connectivity will be checked by pinging the gateway and waiting for the specified timeout (in seconds).<emphasis role="bold"> Example: </emphasis>GATEWAY_PING_TIMEOUT=5</entry></row></tbody></tgroup></table><table><title>dcb 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">app-fcoe-flags</entry><entry align="left">DCB_APP_FCOE_ENABLE, DCB_APP_FCOE_ADVERTISE, DCB_APP_FCOE_WILLING</entry><entry align="left">no</entry><entry align="left">FCOE flags.<emphasis role="bold"> diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index ba6f6311..1343bc15 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: 05 May 2015 +.\" Date: 14 July 2015 .\" Manual: Configuration -.\" Source: NetworkManager 1.0.2 +.\" Source: NetworkManager 1.0.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.0\&.2" "Configuration" +.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.0\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index 8f49a8fc..2ab07314 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>05 May 2015</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.0.2</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>14 July 2015</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.0.4</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 2e1d1be9..35b24d15 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: 05 May 2015 +.\" Date: 14 July 2015 .\" Manual: Configuration -.\" Source: NetworkManager 1.0.2 +.\" Source: NetworkManager 1.0.4 .\" Language: English .\" -.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.0\&.2" "Configuration" +.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.0\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -405,7 +405,7 @@ boolean T}:T{ FALSE T}:T{ -When TRUE, overrides the "ca\-path" and "phase2\-ca\-path" properties using the system CA directory specified at configure time with the \-\-system\-ca\-path switch\&. The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca\-cert" and "phase2\-ca\-cert" properties\&. +When TRUE, overrides the "ca\-path" and "phase2\-ca\-path" properties using the system CA directory specified at configure time with the \-\-system\-ca\-path switch\&. The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca\-cert" and "phase2\-ca\-cert" properties\&. If the path provided with \-\-system\-ca\-path is rather a file name (bundle of trusted CA certificates), it overrides "ca\-cert" and "phase2\-ca\-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant)\&. T} .TE .sp 1 @@ -888,6 +888,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{ autoconnect @@ -908,6 +909,15 @@ T}:T{ The autoconnect priority\&. If the connection is set to autoconnect, connections with higher priority will be preferred\&. Defaults to 0\&. The higher number means higher priority\&. T} T{ +autoconnect\-slaves +T}:T{ +NMSettingConnectionAutoconnectSlaves (int32) +T}:T{ +\ \& +T}:T{ +Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection\&. This only has a real effect for master connections\&. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, \-1: default\&. If \-1 (default) is set, global connection\&.autoconnect\-slaves is read to determine the real value\&. If it is default as well, this fallbacks to 0\&. +T} +T{ gateway\-ping\-timeout T}:T{ uint32 @@ -1755,7 +1765,7 @@ NMSettingIP6ConfigPrivacy (int32) T}:T{ \ \& T}:T{ -Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941\&. If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI\-64\&. This enhances privacy, but could cause problems in some applications, on the other hand\&. The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses)\&. +Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941\&. If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI\-64\&. This enhances privacy, but could cause problems in some applications, on the other hand\&. The permitted values are: \-1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses)\&. Having a per\-connection setting set to "\-1" (unknown) means fallback to global configuration "ipv6\&.ip6\-privacy"\&. If also global configuration is unspecified or set to "\-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr"\&. T} T{ may\-fail diff --git a/man/nm-settings.xml b/man/nm-settings.xml index d70b1771..d289d2d3 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>05 May 2015</date></refentryinfo><refmeta><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.0.2</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>14 July 2015</date></refentryinfo><refmeta><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.0.4</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 @@ -66,7 +66,7 @@ <row><entry align="left">private-key-password</entry><entry align="left">string</entry><entry align="left"/><entry>The password used to decrypt the private key specified in the "private-key" property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.</entry></row> <row><entry align="left">private-key-password-flags</entry><entry align="left">NMSettingSecretFlags (uint32)</entry><entry align="left"/><entry>Flags indicating how to handle the "private-key-password" property. (see <xref linkend="secrets-flags"/> for flag values)</entry></row> <row><entry align="left">subject-match</entry><entry align="left">string</entry><entry align="left"/><entry>Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.</entry></row> - <row><entry align="left">system-ca-certs</entry><entry align="left">boolean</entry><entry align="left">FALSE</entry><entry>When TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch. The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties.</entry></row> + <row><entry align="left">system-ca-certs</entry><entry align="left">boolean</entry><entry align="left">FALSE</entry><entry>When TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch. The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides "ca-cert" and "phase2-ca-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).</entry></row> </tbody></tgroup></table> <table><title>adsl 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">encapsulation</entry><entry align="left">string</entry><entry align="left"/><entry>Encapsulation of ADSL connection. Can be "vcmux" or "llc".</entry></row> @@ -115,6 +115,7 @@ <table><title>connection 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">autoconnect</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry>Whether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.</entry></row> <row><entry align="left">autoconnect-priority</entry><entry align="left">int32</entry><entry align="left">0</entry><entry>The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.</entry></row> + <row><entry align="left">autoconnect-slaves</entry><entry align="left">NMSettingConnectionAutoconnectSlaves (int32)</entry><entry align="left"/><entry>Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.</entry></row> <row><entry align="left">gateway-ping-timeout</entry><entry align="left">uint32</entry><entry align="left">0</entry><entry>If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.</entry></row> <row><entry align="left">id</entry><entry align="left">string</entry><entry align="left"/><entry>A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".</entry></row> <row><entry align="left">interface-name</entry><entry align="left">string</entry><entry align="left"/><entry>The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.</entry></row> @@ -199,7 +200,7 @@ <row><entry align="left">gateway</entry><entry align="left">string</entry><entry align="left"/><entry>The gateway associated with this configuration. This is only meaningful if "addresses" is also set.</entry></row> <row><entry align="left">ignore-auto-dns</entry><entry align="left">boolean</entry><entry align="left">FALSE</entry><entry>When "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.</entry></row> <row><entry align="left">ignore-auto-routes</entry><entry align="left">boolean</entry><entry align="left">FALSE</entry><entry>When "method" is set to "auto" and this property to TRUE, automatically configured routes are ignored and only routes specified in the "routes" property, if any, are used.</entry></row> - <row><entry align="left">ip6-privacy</entry><entry align="left">NMSettingIP6ConfigPrivacy (int32)</entry><entry align="left"/><entry>Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64. This enhances privacy, but could cause problems in some applications, on the other hand. The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses).</entry></row> + <row><entry align="left">ip6-privacy</entry><entry align="left">NMSettingIP6ConfigPrivacy (int32)</entry><entry align="left"/><entry>Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64. This enhances privacy, but could cause problems in some applications, on the other hand. The permitted values are: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to "-1" (unknown) means fallback to global configuration "ipv6.ip6-privacy". If also global configuration is unspecified or set to "-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr".</entry></row> <row><entry align="left">may-fail</entry><entry align="left">boolean</entry><entry align="left">TRUE</entry><entry>If TRUE, allow overall network configuration to proceed even if the configuration specified by this property times out. Note that at least one IP configuration must succeed or overall network configuration will still fail. For example, in IPv6-only networks, setting this property to TRUE on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.</entry></row> <row><entry align="left">method</entry><entry align="left">string</entry><entry align="left"/><entry>IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration. The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty.</entry></row> <row><entry align="left">name</entry><entry align="left">string</entry><entry align="left">ipv6</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> diff --git a/man/nmcli.1.in b/man/nmcli.1.in index f6df1b0a..335b6511 100644 --- a/man/nmcli.1.in +++ b/man/nmcli.1.in @@ -398,6 +398,8 @@ If <ID> is ambiguous, a keyword \fIid\fP, \fIuuid\fP, \fIpath\fP or \fIapath\fP can be used. .br See \fBconnection show\fP above for the description of the <ID>-specifying keywords. +.br +If '--wait' option is not specified, the default timeout will be 10 seconds. .TP .B add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS .br @@ -686,6 +688,8 @@ its name, UUID or D-Bus path. If <ID> is ambiguous, a keyword \fIid\fP, \fIuuid\fP or \fIpath\fP can be used. .br See \fBconnection show\fP above for the description of the <ID>-specifying keywords. +.br +If '--wait' option is not specified, the default timeout will be 10 seconds. .TP .B reload .br @@ -730,14 +734,15 @@ will be activated. It will also consider connections that are not set to auto co .br If '--wait' option is not specified, the default timeout will be 90 seconds. .TP -.B disconnect <ifname> +.B disconnect <ifname> ... .br Disconnect a device and prevent the device from automatically activating further -connections without user/manual intervention. +connections without user/manual intervention. Note that disconnecting software +devices may mean that the devices will disappear. .br If '--wait' option is not specified, the default timeout will be 10 seconds. .TP -.B delete <ifname> +.B delete <ifname> ... .br Delete a device. The command removes the interface from the system. Note that this only works for software devices like bonds, bridges, teams, etc. |