Re: [PULL v2 12/13] configure: correctly honour --disable-containers

["Daniel P. Berrangé" <berrange@redhat.com>]

I'm dropping this patch from the PULL refresh, since Pierrick's
merged patches remove the container engine probing from configure,
so the bug this fixed appears to not exist any more.

On Fri, Sep 04, 2026 at 05:06:42PM +0100, Daniel P. Berrangé wrote:
> The configure script originally only probed for 'runc' command
> in order to handle cross-compilation containers. The Makefile
> under tests/docker would then probe again when used.
> 
> In order to eliminate the additional probeing, we changed
> configure in commit c4ce04cfb7460d46c0262d437a7f35bb5c5fc449
> to always probe for 'runc', so the result could be passed
> along to tests/docker make rules.
> 
> That commit overlooked that the 'probe_target_compiler' func
> was relying on '$runc' == 'no' as a proxy for the state of
> the --disable-containers arg.
> 
> When we started unconditionally probing, that short cut no
> longer works and we must explicitly check "$use_containers"
> too.
> 
> Fixes: c4ce04cfb7460d46c0262d437a7f35bb5c5fc449
> Reported-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Tested-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  configure | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configure b/configure
> index 46cbcc085b..d3ad7d4062 100755
> --- a/configure
> +++ b/configure
> @@ -1414,6 +1414,7 @@ probe_target_compiler() {
>    esac
>  
>    for host in $container_hosts; do
> +    test "$use_containers" = "yes" || continue
>      test "$container_command" != "" || continue
>      test "$host" = "$cpu" || continue
>      case $target_arch in
> -- 
> 2.55.0
> 

With regards,
Daniel
-- 
|: https://berrange.com       ~~        https://hachyderm.io/@berrange :|
|: https://libvirt.org          ~~          https://entangle-photo.org :|
|: https://pixelfed.art/berrange   ~~    https://fstop138.berrange.com :|