Skip to content
Snippets Groups Projects
Commit 59a02c5b authored by Simon McVittie's avatar Simon McVittie
Browse files

pv-runtime: Never bind-mount /etc/ld.so.cache, /etc/ld.so.conf


bind_runtime_ld_so() is called whenever bwrap != NULL, and it makes
/etc/ld.so.cache, /etc/ld.so.conf into symlinks to
/run/pressure-vessel/ldso/ so that we can regenerate ld.so.cache
in the adverb. This is done whether we have a mutable sysroot or not.

This resolves an automated test failure when running with
--no-copy-runtime.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent bf94b7f6
No related branches found
No related tags found
1 merge request!356pv-runtime: Never bind-mount /etc/ld.so.cache, /etc/ld.so.conf
Pipeline #16579 passed
......@@ -2466,6 +2466,8 @@ bind_runtime_base (PvRuntime *self,
static const char * const dont_bind[] =
{
"/etc/asound.conf",
"/etc/ld.so.cache",
"/etc/ld.so.conf",
"/etc/localtime",
"/etc/machine-id",
"/var/cache/ldconfig",
......@@ -2602,16 +2604,6 @@ bind_runtime_base (PvRuntime *self,
if (self->provider != NULL && g_strv_contains (from_provider, dest))
continue;
if (self->mutable_sysroot != NULL)
{
/* If we have a mutable sysroot, we handle ld.so.cache
* separately later, because we want to set it up to be
* possible for the -adverb to overwrite it. */
if (strcmp (dest, "/etc/ld.so.cache") == 0
|| strcmp (dest, "/etc/ld.so.conf") == 0)
continue;
}
full = g_build_filename (self->runtime_files,
bind_mutable[i],
member,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment