diff options
| author | Michael Biebl <biebl@debian.org> | 2019-12-18 18:30:31 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-12-18 18:30:31 +0100 |
| commit | 4bde769dba8f804547ce1f5fcda731035d3d45f1 (patch) | |
| tree | 3a4907fdbf4972fad5a036ef64ce643d704e8733 /man/NetworkManager.conf.xml | |
| parent | bbf6329c27676323a899b7328575cc3f6c5f48cc (diff) | |
| parent | 28028b26b3371756811e95d894f709f4b1207c00 (diff) | |
Update upstream source from tag 'upstream/1.22.0'
Update to upstream version '1.22.0' with Debian dir a81ba1028908d08fc4866734c3df4a042bf9a511
Diffstat (limited to 'man/NetworkManager.conf.xml')
| -rw-r--r-- | man/NetworkManager.conf.xml | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index e56de210..c0c05147 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -158,8 +158,11 @@ plugins-=remove-me <varlistentry> <term><varname>auth-polkit</varname></term> <listitem><para>Whether the system uses PolicyKit for authorization. - If <literal>false</literal>, all requests will be allowed. If - <literal>true</literal>, non-root requests are authorized using PolicyKit. + If <literal>true</literal>, non-root requests are authorized using PolicyKit. + Requests from root (user ID zero) are always granted without asking PolicyKit. + If <literal>false</literal>, all requests will be allowed and PolicyKit is + not used. If set to <literal>root-only</literal> PolicyKit is not used and + all requests except root are denied. The default value is <literal>&NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT;</literal>. </para></listitem> </varlistentry> @@ -713,6 +716,14 @@ ipv6.ip6-privacy=0 <term><varname>ipv4.dhcp-client-id</varname></term> </varlistentry> <varlistentry> + <term><varname>ipv4.dhcp-iaid</varname></term> + <listitem><para>If left unspecified, it defaults to "ifname".</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>ipv4.dhcp-hostname-flags</varname></term> + <listitem><para>If left unspecified, the value 3 (fqdn-encoded,fqdn-serv-update) is used.</para></listitem> + </varlistentry> + <varlistentry> <term><varname>ipv4.dhcp-timeout</varname></term> <listitem><para>If left unspecified, the default value for the interface type is used.</para></listitem> @@ -737,6 +748,14 @@ ipv6.ip6-privacy=0 <listitem><para>If left unspecified, it defaults to "lease".</para></listitem> </varlistentry> <varlistentry> + <term><varname>ipv6.dhcp-iaid</varname></term> + <listitem><para>If left unspecified, it defaults to "ifname".</para></listitem> + </varlistentry> + <varlistentry> + <term><varname>ipv6.dhcp-hostname-flags</varname></term> + <listitem><para>If left unspecified, the value 1 (fqdn-serv-update) is used.</para></listitem> + </varlistentry> + <varlistentry> <term><varname>ipv6.dhcp-timeout</varname></term> <listitem><para>If left unspecified, the default value for the interface type is used.</para></listitem> |