diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2023-05-31 09:07:59 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2023-06-29 10:15:48 +0200 |
| commit | 9c90503ffecf830d2008a0f938bfc73088eb297a (patch) | |
| tree | 0b5e6703014905bb911dda6916a29fbcb74e12cc | |
| parent | 3ad7e4b7e654f1c2c964b53fa7267e91586c8a33 (diff) | |
build: don't enable ifcfg-rh by default on RH distros
Now that the plugin is deprecated, it should be enabled only by
explicit user configuration.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | meson.build | 5 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 2dcbb8a29c..d007559849 100644 --- a/configure.ac +++ b/configure.ac @@ -175,7 +175,6 @@ AC_CHECK_FUNCS([__secure_getenv secure_getenv]) AC_ARG_ENABLE(ifcfg-rh, AS_HELP_STRING([--enable-ifcfg-rh], [enable ifcfg-rh configuration plugin (Fedora/RHEL) (deprecated)])) AC_ARG_ENABLE(ifupdown, AS_HELP_STRING([--enable-ifupdown], [enable ifupdown configuration plugin (Debian/Ubuntu)])) # Default alternative plugins by distribution -AS_IF([test -z "$enable_ifcfg_rh" -a -d /etc/sysconfig/network-scripts], enable_ifcfg_rh=yes) AS_IF([test -z "$enable_ifupdown" -a -f /etc/debian_version], enable_ifupdown=yes) # Otherwise, plugins default to "no" AS_IF([test -z "$enable_ifcfg_rh"], enable_ifcfg_rh=no) diff --git a/meson.build b/meson.build index b234e867cd..e6a21af561 100644 --- a/meson.build +++ b/meson.build @@ -289,11 +289,6 @@ glib_dep = declare_dependency( ) enable_ifcfg_rh = get_option('ifcfg_rh') -if enable_ifcfg_rh == 'auto' - enable_ifcfg_rh = (run_command('test', '-e', '/etc/sysconfig/network-scripts').returncode() == 0) -else - enable_ifcfg_rh = (enable_ifcfg_rh != 'false') -endif enable_ifupdown = get_option('ifupdown') if enable_ifupdown == 'auto' diff --git a/meson_options.txt b/meson_options.txt index ff8f4f1fe2..4956afe924 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -45,7 +45,7 @@ option('ebpf', type: 'combo', choices: ['auto', 'true', 'false'], description: ' # configuration plugins option('config_plugins_default', type: 'string', value: '', description: 'Default configuration option for main.plugins setting, used as fallback if the configuration option is unset') -option('ifcfg_rh', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'enable ifcfg-rh configuration plugin (Fedora/RHEL) (deprecated)') +option('ifcfg_rh', type: 'boolean', value: false, description: 'enable ifcfg-rh configuration plugin (Fedora/RHEL) (deprecated)') option('ifupdown', type: 'combo', choices:['auto', 'true', 'false'], value: 'auto', description: 'enable ifupdown configuration plugin (Debian/Ubuntu)') # handlers for resolv.conf |