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.xml | |
| 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.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> |