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

pv_wrap_append_preload: Remove a Flatpak/non-Flatpak branch


In reality, we have a FlatpakExports if and only if we are not creating
a Flatpak subsandbox. If a caller somehow passes in a FlatpakExports
while creating a subsandbox, it's harmless to tell it what to export.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent b5541c41
No related branches found
No related tags found
1 merge request!337pressure-vessel: Remap preloadable modules better
......@@ -438,30 +438,11 @@ pv_wrap_append_preload (GPtrArray *argv,
return;
}
/* A subsandbox will just have the same LD_PRELOAD as the
* Flatpak itself, except that we have to redirect /usr and /app
* into /run/parent. */
if (flags & PV_APPEND_PRELOAD_FLAGS_FLATPAK_SUBSANDBOX)
{
/* No FlatpakExports here: any file not in /usr or /app that
* is visible to our "parent" Flatpak app is also visible
* to us. */
append_preload_internal (argv,
option,
preload,
env,
flags,
runtime,
NULL);
}
else
{
append_preload_internal (argv,
option,
preload,
env,
flags,
runtime,
exports);
}
append_preload_internal (argv,
option,
preload,
env,
flags,
runtime,
exports);
}
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