53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
From 4c19b09a356a14a1042d962e3d9e856695479c33 Mon Sep 17 00:00:00 2001
|
|
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
Date: Wed, 14 Nov 2018 16:35:53 +0100
|
|
Subject: [PATCH 2/3] man: add missing connection defaults
|
|
|
|
(cherry picked from commit a482b27593a757ea534d9a9989d7e409b8b2d4ed)
|
|
(cherry picked from commit 9135603c93db12adbd9a1982ab45bc84d2078780)
|
|
(cherry picked from commit f0890cc83fb5d0ce9c7d4800ab2818666c70dd16)
|
|
---
|
|
man/NetworkManager.conf.xml | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
|
|
index 17bc42f34..f2addce14 100644
|
|
--- a/man/NetworkManager.conf.xml
|
|
+++ b/man/NetworkManager.conf.xml
|
|
@@ -642,6 +642,12 @@ ipv6.ip6-privacy=0
|
|
A default value is only consulted if the corresponding per-connection value
|
|
explicitly allows for that.
|
|
<variablelist>
|
|
+ <varlistentry>
|
|
+ <term><varname>802-1x.auth-timeout</varname></term>
|
|
+ </varlistentry>
|
|
+ <varlistentry>
|
|
+ <term><varname>cdma.mtu</varname></term>
|
|
+ </varlistentry>
|
|
<varlistentry>
|
|
<term><varname>connection.auth-retries</varname></term>
|
|
<listitem><para>If left unspecified, the default value is 3 tries before failing the connection.
|
|
@@ -673,6 +679,9 @@ ipv6.ip6-privacy=0
|
|
<varlistentry>
|
|
<term><varname>ethernet.wake-on-lan</varname></term>
|
|
</varlistentry>
|
|
+ <varlistentry>
|
|
+ <term><varname>gsm.mtu</varname></term>
|
|
+ </varlistentry>
|
|
<varlistentry>
|
|
<term><varname>infiniband.mtu</varname></term>
|
|
<listitem><para>If configured explicitly to 0, the MTU is not reconfigured during device activation unless it is required due to IPv6 constraints. If left unspecified, a DHCP/IPv6 SLAAC provided value is used or the MTU is left unspecified on activation.</para></listitem>
|
|
@@ -763,6 +772,9 @@ ipv6.ip6-privacy=0
|
|
<listitem><para>If left unspecified, the default value
|
|
"<literal>optional</literal>" will be used.</para></listitem>
|
|
</varlistentry>
|
|
+ <varlistentry>
|
|
+ <term><varname>wifi.wake-on-wlan</varname></term>
|
|
+ </varlistentry>
|
|
</variablelist>
|
|
</para>
|
|
</refsect2>
|
|
--
|
|
2.17.1
|
|
|