diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-07 16:43:07 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-07 16:43:07 +0100 |
| commit | a524db35ac5c2099671d16318524e277e88631be (patch) | |
| tree | 54b29c42a317b9a13c3049ff85b14f7dce734cf6 /man/NetworkManager.conf.5 | |
| parent | 6917e28d2d16138d6d497dc96efafe573b4b0979 (diff) | |
| parent | 724bcc5c7be3aed3646ed2b2989c34d438217176 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream
Diffstat (limited to 'man/NetworkManager.conf.5')
| -rw-r--r-- | man/NetworkManager.conf.5 | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 56ef1ec8..3e6c009b 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: 09/30/2019 +.\" Date: 12/24/2019 .\" Manual: Configuration -.\" Source: NetworkManager 1.20.4 +.\" Source: NetworkManager 1.22.2 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.20\&.4" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.22\&.2" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -126,8 +126,10 @@ This setting is deprecated and has no effect\&. \fIauth\-polkit\fR .RS 4 Whether the system uses PolicyKit for authorization\&. If -false, all requests will be allowed\&. If -true, non\-root requests are authorized using PolicyKit\&. The default value is +true, non\-root requests are authorized using PolicyKit\&. Requests from root (user ID zero) are always granted without asking PolicyKit\&. If +false, all requests will be allowed and PolicyKit is not used\&. If set to +root\-only +PolicyKit is not used and all requests except root are denied\&. The default value is true\&. .RE .PP @@ -696,6 +698,16 @@ If configured explicitly to 0, the MTU is not reconfigured during device activat .RS 4 .RE .PP +\fIipv4\&.dhcp\-iaid\fR +.RS 4 +If left unspecified, it defaults to "ifname"\&. +.RE +.PP +\fIipv4\&.dhcp\-hostname\-flags\fR +.RS 4 +If left unspecified, the value 3 (fqdn\-encoded,fqdn\-serv\-update) is used\&. +.RE +.PP \fIipv4\&.dhcp\-timeout\fR .RS 4 If left unspecified, the default value for the interface type is used\&. @@ -720,6 +732,16 @@ If left unspecified, routes are only added to the main table\&. Note that this i If left unspecified, it defaults to "lease"\&. .RE .PP +\fIipv6\&.dhcp\-iaid\fR +.RS 4 +If left unspecified, it defaults to "ifname"\&. +.RE +.PP +\fIipv6\&.dhcp\-hostname\-flags\fR +.RS 4 +If left unspecified, the value 1 (fqdn\-serv\-update) is used\&. +.RE +.PP \fIipv6\&.dhcp\-timeout\fR .RS 4 If left unspecified, the default value for the interface type is used\&. |