fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 04:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'bg/dhcp-doc'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2111
This commit is contained in:
Beniamino Galvani 2025-01-20 19:06:29 +01:00
commit 610e0cb8cd
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
man/NetworkManager.conf.xml
View file

@ -167,17 +167,14 @@ plugins-=remove-me
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>dhcp</varname></term> <term><varname>dhcp</varname></term>
<listitem><para>This key sets up what DHCP client <listitem><para>This key sets up what DHCP client NetworkManager will
NetworkManager will use. Allowed values depend on build configuration and use. Allowed values depend on build configuration; this version of
typically include <literal>internal</literal> and <literal>dhcpcd</literal>. NetworkManager was built with support for the following clients:
Support for unmaintained <literal>dhclient</literal> client has been deprecated &NM_DHCP_CLIENTS_ENABLED_TEXT;.</para>
and disabled by default.</para>
<para>The <literal>internal</literal> client is built-in, while other options <para>The <literal>internal</literal> client is built-in, while other options
may require an external DHCP client to be installed.</para> may require an external DHCP client to be installed.</para>
<para>If this key is missing, <literal>&NM_CONFIG_DEFAULT_MAIN_DHCP;</literal> <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: is used with a fallback to other supported clients.</para></listitem>
<literal>internal</literal>, <literal>dhcpcd</literal>,
<literal>dhclient</literal>.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>no-auto-default</varname></term> <term><varname>no-auto-default</varname></term>
@ -360,7 +357,7 @@ no-auto-default=*
management mode. This option is about how NetworkManager writes to management mode. This option is about how NetworkManager writes to
<filename>/etc/resolv.conf</filename>, if at all. <filename>/etc/resolv.conf</filename>, if at all.
The default value depends on NetworkManager build The default value depends on NetworkManager build
options, and this version of NetworkManager was build with a default of options, and this version of NetworkManager was built with a default of
"<literal>&NM_CONFIG_DEFAULT_MAIN_RC_MANAGER;</literal>". "<literal>&NM_CONFIG_DEFAULT_MAIN_RC_MANAGER;</literal>".
Regardless of this setting, NetworkManager will Regardless of this setting, NetworkManager will
always write its version of resolv.conf to its runtime state directory always write its version of resolv.conf to its runtime state directory

1
man/common.ent.in
View file

@ -10,3 +10,4 @@
<!ENTITY NM_CONFIG_DEFAULT_MAIN_DHCP "@NM_CONFIG_DEFAULT_MAIN_DHCP@"> <!ENTITY NM_CONFIG_DEFAULT_MAIN_DHCP "@NM_CONFIG_DEFAULT_MAIN_DHCP@">
<!ENTITY NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH_TEXT "@NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH_TEXT@"> <!ENTITY NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH_TEXT "@NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH_TEXT@">
<!ENTITY NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT "@NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT@"> <!ENTITY NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT "@NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT@">
<!ENTITY NM_DHCP_CLIENTS_ENABLED_TEXT "@NM_DHCP_CLIENTS_ENABLED@">

5
meson.build
View file

@ -631,8 +631,9 @@ config_h.set10('WITH_OFONO', enable_ofono)
# DHCP client support # DHCP client support
config_dhcp_default = get_option('config_dhcp_default') config_dhcp_default = get_option('config_dhcp_default')
config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_DHCP', config_dhcp_default) config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_DHCP', config_dhcp_default)
config_dhcp_clients_enabled = [ 'internal' ]
dhcp_summary = '' dhcp_summary = ''
foreach client : [ 'dhclient', 'dhcpcd' ] foreach client : [ 'dhcpcd', 'dhclient' ]
client_path = get_option(client) client_path = get_option(client)
client_enable = (client_path != 'no') client_enable = (client_path != 'no')
if client_enable if client_enable
@ -662,6 +663,7 @@ foreach client : [ 'dhclient', 'dhcpcd' ]
dhcp_summary += (' ' + client + ': ' + client_enable.to_string()) dhcp_summary += (' ' + client + ': ' + client_enable.to_string())
if (client_enable) if (client_enable)
dhcp_summary += (' ' + client_path) dhcp_summary += (' ' + client_path)
config_dhcp_clients_enabled += client
endif endif
if (client == 'dhclient') if (client == 'dhclient')
dhcp_summary += ' (deprecated)' dhcp_summary += ' (deprecated)'
@ -935,6 +937,7 @@ data_conf.set('NM_CONFIG_DEFAULT_MAIN_DHCP', config_dhcp_default)
data_conf.set('NM_CONFIG_DEFAULT_MAIN_RC_MANAGER', config_dns_rc_manager_default) data_conf.set('NM_CONFIG_DEFAULT_MAIN_RC_MANAGER', config_dns_rc_manager_default)
data_conf.set('NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH_TEXT', config_migrate_ifcfg_rh_default) data_conf.set('NM_CONFIG_DEFAULT_MAIN_MIGRATE_IFCFG_RH_TEXT', config_migrate_ifcfg_rh_default)
data_conf.set('NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT', config_wifi_backend_default) data_conf.set('NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT', config_wifi_backend_default)
data_conf.set('NM_DHCP_CLIENTS_ENABLED', ', '.join(config_dhcp_clients_enabled))
data_conf.set('NM_MAJOR_VERSION', nm_major_version) data_conf.set('NM_MAJOR_VERSION', nm_major_version)
data_conf.set('NM_MICRO_VERSION', nm_micro_version) data_conf.set('NM_MICRO_VERSION', nm_micro_version)
data_conf.set('NM_MINOR_VERSION', nm_minor_version) data_conf.set('NM_MINOR_VERSION', nm_minor_version)