diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2018-09-07 17:02:59 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2018-09-13 14:35:18 +0200 |
| commit | 73249e2ef7a27ffd2de54db9476aa468837bdd4d (patch) | |
| tree | 59b5c33c21a4806ecaeec941cde4b47217c3784d /meson_options.txt | |
| parent | 4fd662316165bcd603664ab9bc60ad0ee96037f9 (diff) | |
| download | NetworkManager-73249e2ef7a27ffd2de54db9476aa468837bdd4d.tar.gz | |
build: meson: uniform handling of dhcp client paths
Handle all dhcp client paths through the same code.
(cherry picked from commit 36b0e46146ec7f67acb365e83e306d781f198d1c)
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meson_options.txt b/meson_options.txt index 294c955a83..5e5fd726ac 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -54,9 +54,9 @@ option('netconfig', type: 'array', value: ['netconfig', '/sbin/netconfig', '/usr option('config_dns_rc_manager_default', type: 'combo', choices: ['symlink', 'file', 'netconfig', 'resolvconf'], value: 'symlink', description: 'Configure default value for main.rc-manager setting') # dhcp clients -option('dhcpcanon', type: 'array', value: ['dhcpcanon', '/sbin/dhcpcanon', '/usr/sbin/dhcpcanon', '/usr/local/sbin/dhcpcanon', '/usr/bin/dhcpcanon', '/usr/local/bin/dhcpcanon'], description: 'Enable dhcpcanon support (experimental)') -option('dhclient', type: 'array', value: ['dhclient', '/sbin/dhclient', '/usr/sbin/dhclient', '/usr/local/sbin/dhclient'], description: 'Enable dhclient support') -option('dhcpcd', type: 'array', value: ['dhcpcd', '/sbin/dhcpcd', '/usr/sbin/dhcpcd', '/usr/local/sbin/dhcpcd'], description: 'Enable dhcpcd support') +option('dhclient', type: 'string', value: '', description: 'Enable dhclient support') +option('dhcpcanon', type: 'string', value: '', description: 'Enable dhcpcanon support (experimental)') +option('dhcpcd', type: 'string', value: '', description: 'Enable dhcpcd support') option('config_dhcp_default', type: 'combo', choices: ['dhcpcanon', 'dhclient', 'dhcpcd', 'internal'], value: 'internal', description: 'Default configuration option for main.dhcp setting, used as fallback if the configuration option is unset') # miscellaneous |