colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

man: document which DHCP clients are enabled in this build

Browse Source 
Describe in the NetworkManager.conf man page what DHCP clients the
user can set in this build, instead of showing a generic list and
letting the user try each one.
This commit is contained in:
Beniamino Galvani
2025-01-15 16:14:04 +01:00
parent 98b124a661
commit 774484eed6
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
man/NetworkManager.conf.xml
View File

@@ -167,11 +167,10 @@ plugins-=remove-me
</varlistentry>
<varlistentry>
<term><varname>dhcp</varname></term>
<listitem><para>This key sets up what DHCP client
NetworkManager will use. Allowed values depend on build configuration and
typically include <literal>internal</literal> and <literal>dhcpcd</literal>.
Support for unmaintained <literal>dhclient</literal> client has been deprecated
and disabled by default.</para>
<listitem><para>This key sets up what DHCP client NetworkManager will
use. Allowed values depend on build configuration; this version of
NetworkManager was built with support for the following clients:
&NM_DHCP_CLIENTS_ENABLED_TEXT;.</para>
<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>

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_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_DHCP_CLIENTS_ENABLED_TEXT "@NM_DHCP_CLIENTS_ENABLED@">

3
meson.build
View File

@@ -631,6 +631,7 @@ config_h.set10('WITH_OFONO', enable_ofono)
# DHCP client support
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' ]
client_path = get_option(client)
@@ -662,6 +663,7 @@ foreach client : [ 'dhclient', 'dhcpcd' ]
dhcp_summary += (' ' + client + ': ' + client_enable.to_string())
if (client_enable)
dhcp_summary += (' ' + client_path)
config_dhcp_clients_enabled += client
endif
if (client == 'dhclient')
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_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_DHCP_CLIENTS_ENABLED', ', '.join(config_dhcp_clients_enabled))
data_conf.set('NM_MAJOR_VERSION', nm_major_version)
data_conf.set('NM_MICRO_VERSION', nm_micro_version)
data_conf.set('NM_MINOR_VERSION', nm_minor_version)