From 4741abe61501f6e1b105f3870abc0e8aa98134b8 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Thu, 10 Dec 2020 20:11:21 +0000 Subject: [PATCH] runtime: Don't fail if we can't resolve ld.so in mutable sysroot This brings it in line with the other code path here, which tolerates containers that are single-architecture. Signed-off-by: Simon McVittie <smcv@collabora.com> --- pressure-vessel/runtime.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pressure-vessel/runtime.c b/pressure-vessel/runtime.c index 152670ed5..e5b3638b4 100644 --- a/pressure-vessel/runtime.c +++ b/pressure-vessel/runtime.c @@ -2891,10 +2891,11 @@ pv_runtime_use_provider_graphics_stack (PvRuntime *self, arch->ld_so, SRT_RESOLVE_FLAGS_NONE, &ld_so_in_runtime, - error); + NULL); - if (fd < 0) - return FALSE; + /* Ignore fd, and just let it close: we're resolving + * the path for its side-effect of populating + * ld_so_in_runtime. */ } else { -- GitLab