about summary refs log tree commit diff
path: root/man/NetworkManager.conf.5
diff options
context:
space:
mode:
Diffstat (limited to 'man/NetworkManager.conf.5')
-rw-r--r--man/NetworkManager.conf.511
1 files changed, 8 insertions, 3 deletions
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 27552930..aa31c809 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 11/10/2017
+.\"      Date: 12/12/2017
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.10.0
+.\"    Source: NetworkManager 1.10.2
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.10\&.0" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.10\&.2" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -791,6 +791,11 @@ The following properties can be configured per\-device\&.
 Whether the device is managed or not\&. A device can be marked as managed via udev rules (ENV{NM_UNMANAGED}), or via setting plugins (keyfile\&.unmanaged\-devices)\&. This is yet another way\&. Note that this configuration can be overruled at runtime via D\-Bus\&. Also, it has higher priority then udev rules\&.
 .RE
 .PP
+\fIcarrier\-wait\-timeout\fR
+.RS 4
+Specify the timeout for waiting for carrier in milliseconds\&. When the device loses carrier, NetworkManager does not react immediately\&. Instead, it waits for this timeout before considering the link lost\&. Also, on startup, NetworkManager considers the device as busy for this time, as long as the device has no carrier\&. This delays startup\-complete signal and NetworkManager\-wait\-online\&. Configuring this too high means to block NetworkManager\-wait\-online longer then necessary\&. Configuring it too low, means that NetworkManager will declare startup\-complete, although carrier is about to come and auto\-activation to kick in\&. The default is 5000 milliseconds\&.
+.RE
+.PP
 \fIignore\-carrier\fR
 .RS 4
 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\&.