diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2018-09-07 17:12:31 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2018-09-13 14:35:19 +0200 |
| commit | 5a0cef2f3632ca980b2df6a8fd2e09dffabc69a2 (patch) | |
| tree | 70ab4c914ddc8b949650706141b9a2231ff8a7e5 /meson_options.txt | |
| parent | 73249e2ef7a27ffd2de54db9476aa468837bdd4d (diff) | |
| download | NetworkManager-5a0cef2f3632ca980b2df6a8fd2e09dffabc69a2.tar.gz | |
build: meson: uniform handling of rc managers
Handle all rc managers paths through the same code.
(cherry picked from commit 2fd7559819c2de392d6964cacc0032d2066d0d6e)
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meson_options.txt b/meson_options.txt index 5e5fd726ac..7f06d53a71 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -49,8 +49,8 @@ option('ifcfg_rh', type: 'boolean', value: false, description: 'enable ifcfg-rh option('ifupdown', type: 'boolean', value: false, description: 'enable ifupdown configuration plugin (Debian/Ubuntu)') # handlers for resolv.conf -option('resolvconf', type: 'array', value: ['resolvconf', '/sbin/resolvconf', '/usr/sbin/resolvconf', '/usr/local/sbin/resolvconf'], description: 'Enable resolvconf support') -option('netconfig', type: 'array', value: ['netconfig', '/sbin/netconfig', '/usr/sbin/netconfig', '/usr/local/sbin/netconfig'], description: 'Enable SUSE netconfig support') +option('resolvconf', type: 'string', value: '', description: 'Enable resolvconf support') +option('netconfig', type: 'string', value: '', description: 'Enable SUSE netconfig support') 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 |