about summary refs log tree commit diff
path: root/man/nm-settings-ifcfg-rh.5
diff options
context:
space:
mode:
Diffstat (limited to 'man/nm-settings-ifcfg-rh.5')
-rw-r--r--man/nm-settings-ifcfg-rh.599
1 files changed, 84 insertions, 15 deletions
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index 9e9782e7..8ac7d7eb 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: 
 .\" 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 "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.10\&.0" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.10\&.2" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -854,11 +854,11 @@ l l l l.
 T{
 mac\-address
 T}:T{
-MACADDR\fI(+)\fR
+BRIDGE_MACADDR\fI(+)\fR
 T}:T{
 \ \&
 T}:T{
-MAC address of the bridge\&. Note that this requires a recent kernel support, originally introduced in 3\&.15 upstream kernel) MACADDR for bridges is an NM extension\&.
+MAC address of the bridge\&. Note that this requires a recent kernel support, originally introduced in 3\&.15 upstream kernel) BRIDGE_MACADDR for bridges is an NM extension\&.
 T}
 T{
 stp
@@ -1473,6 +1473,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
@@ -1609,6 +1610,17 @@ T}:T{
 IPV4_ROUTE_TABLE enables policy\-routing and sets the default routing table\&.
 T}
 T{
+dns\-options
+T}:T{
+RES_OPTIONS\fI(+)\fR
+T}:T{
+\ \&
+T}:T{
+List of DNS options to be added to /etc/resolv\&.conf\fB
+
+Example: \fRRES_OPTIONS=ndots:2 timeout:3
+T}
+T{
 dns\-priority
 T}:T{
 IPV4_DNS_PRIORITY\fI(+)\fR
@@ -1700,6 +1712,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
@@ -1722,7 +1735,7 @@ T}
 T{
 dns\-search
 T}:T{
-DOMAIN
+IPV6_DOMAIN
 T}:T{
 \ \&
 T}:T{
@@ -1834,6 +1847,17 @@ The priority for DNS servers of this connection\&. Lower values have higher prio
 Example: \fRIPV6_DNS_PRIORITY=20
 T}
 T{
+dns\-options
+T}:T{
+IPV6_RES_OPTIONS\fI(+)\fR
+T}:T{
+\ \&
+T}:T{
+List of DNS options to be added to /etc/resolv\&.conf\fB
+
+Example: \fRIPV6_RES_OPTIONS=ndots:2 timeout:3
+T}
+T{
 ip6\-privacy
 T}:T{
 IPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP\fI(+)\fR
@@ -2032,7 +2056,52 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&15.\ \&team\-port setting
+.B Table\ \&15.\ \&tc setting
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Property
+T}:T{
+Ifcfg\-rh Variable
+T}:T{
+Default
+T}:T{
+Description
+T}
+.T&
+l l l l
+l l l l.
+T{
+qdiscs
+T}:T{
+QDISC1, QDISC2, \&.\&.\&.
+T}:T{
+\ \&
+T}:T{
+Queueing disciplines\fB
+
+Example: \fRQDISC1=ingress, QDISC2="root handle 1234: fq_codel"
+T}
+T{
+qdiscs
+T}:T{
+FILTER1, FILTER2, \&.\&.\&.
+T}:T{
+\ \&
+T}:T{
+Traffic filters\fB
+
+Example: \fRFILTER1="parent ffff: matchall action simple sdata Input", \&.\&.\&.
+T}
+.TE
+.sp 1
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.B Table\ \&16.\ \&team\-port setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2063,7 +2132,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&16.\ \&team setting
+.B Table\ \&17.\ \&team setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2094,7 +2163,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.\ \&user setting
+.B Table\ \&18.\ \&user setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2127,7 +2196,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&18.\ \&vlan setting
+.B Table\ \&19.\ \&vlan setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2216,7 +2285,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&19.\ \&802\-3\-ethernet setting
+.B Table\ \&20.\ \&802\-3\-ethernet setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2365,7 +2434,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&20.\ \&802\-11\-wireless\-security setting
+.B Table\ \&21.\ \&802\-11\-wireless\-security setting
 .TS
 allbox tab(:);
 lB lB lB lB.
@@ -2572,11 +2641,11 @@ T}
 T{
 wep\-key\-type
 T}:T{
-KEY<i> or KEY_PASSPHRASE<i>\fI(+)\fR
+KEY<i> or KEY_PASSPHRASE<i>\fI(+)\fR; KEY_TYPE\fI(+)\fR
 T}:T{
 \ \&
 T}:T{
-KEY is used for "key" type (10 or 26 hexadecimal characters, or 5 or 13 character string prefixed with "s:")\&. KEY_PASSPHRASE is used for WEP passphrases\&.\fB
+KEY is used for "key" type (10 or 26 hexadecimal characters, or 5 or 13 character string prefixed with "s:")\&. KEY_PASSPHRASE is used for WEP passphrases\&. KEY_TYPE specifies the key type and can be either \*(Aqkey\*(Aq or \*(Aqpassphrase\*(Aq\&. KEY_TYPE is redundant and can be omitted\&.\fB
 
 Example: \fRKEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkey
 T}
@@ -2598,7 +2667,7 @@ T}
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&21.\ \&802\-11\-wireless setting
+.B Table\ \&22.\ \&802\-11\-wireless setting
 .TS
 allbox tab(:);
 lB lB lB lB.