diff options
| author | Michael Biebl <biebl@debian.org> | 2017-12-12 15:53:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-12-12 15:53:47 +0100 |
| commit | 743faa81fda27a9c03298e8d6074623dc30db606 (patch) | |
| tree | 28418e92b22530bb05f043084626291ed1e3d46b /man/NetworkManager.conf.xml | |
| parent | 8dda18a856c2a05cefcab6278469c9d8df30f935 (diff) | |
| parent | afcd268ea7b1149fbfb66bce4eca659b675da0a2 (diff) | |
Update upstream source from tag 'upstream/1.10.2'
Update to upstream version '1.10.2' with Debian dir 41691ea145b392588cd4e9e7496b61d5a95965fb
Diffstat (limited to 'man/NetworkManager.conf.xml')
| -rw-r--r-- | man/NetworkManager.conf.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index f0c3c5c8..446540aa 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -856,6 +856,24 @@ managed=1 </para> </listitem> </varlistentry> + <varlistentry id="carrier-wait-timeout"> + <term><varname>carrier-wait-timeout</varname></term> + <listitem> + <para> + 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. + </para> + </listitem> + </varlistentry> <varlistentry id="ignore-carrier"> <term><varname>ignore-carrier</varname></term> <listitem> |