fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-09 11:10:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

man: remove sentence about order of DHCP clients

Browse source 
The list describing the order of DHCP clients is confusing because it
doesn't take into account what clients are disabled at build
time. Instead, just show the available clients in the preferred order.
This commit is contained in:
Beniamino Galvani 2025-01-15 16:26:24 +01:00
parent 774484eed6
commit d0330fb909
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
man/NetworkManager.conf.xml
View file

@ -174,9 +174,7 @@ plugins-=remove-me
<para>The <literal>internal</literal> client is built-in, while other options
may require an external DHCP client to be installed.</para>
<para>If this key is missing, <literal>&NM_CONFIG_DEFAULT_MAIN_DHCP;</literal>
is used with a fallback to other suppored clients in this order:
<literal>internal</literal>, <literal>dhcpcd</literal>,
<literal>dhclient</literal>.</para></listitem>
is used with a fallback to other supported clients.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>no-auto-default</varname></term>

2
meson.build
View file

@ -633,7 +633,7 @@ config_dhcp_default = get_option('config_dhcp_default')
config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_DHCP', config_dhcp_default)
config_dhcp_clients_enabled = [ 'internal' ]
dhcp_summary = ''
foreach client : [ 'dhclient', 'dhcpcd' ]
foreach client : [ 'dhcpcd', 'dhclient' ]
client_path = get_option(client)
client_enable = (client_path != 'no')
if client_enable