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

Merge branch 'wip/denittis/libshared_library_guard' into 'master'

wrap: Set the env var to adjust libshared-library-guard configuration path

See merge request !309
parents 39d87c48 fb8e8e6f
Branches
Tags
1 merge request!309wrap: Set the env var to adjust libshared-library-guard configuration path
Pipeline #13717 passed
...@@ -2171,6 +2171,22 @@ main (int argc, ...@@ -2171,6 +2171,22 @@ main (int argc,
adjusted_path = g_build_filename ("/run/parent", preload, NULL); adjusted_path = g_build_filename ("/run/parent", preload, NULL);
g_debug ("%s -> %s", preload, adjusted_path); g_debug ("%s -> %s", preload, adjusted_path);
pv_search_path_append (adjusted, adjusted_path); pv_search_path_append (adjusted, adjusted_path);
if (g_str_has_suffix (preload, "/libshared-library-guard.so"))
{
/* We special case libshared-library-guard because usually
* its blockedlist file is located in `/app` and we need
* to change that to the `/run/parent` counterpart */
const gchar *blockedlist = "/app/etc/freedesktop-sdk.ld.so.blockedlist";
if (g_file_test (blockedlist, G_FILE_TEST_EXISTS))
{
g_autofree gchar *adjusted_blockedlist = NULL;
adjusted_blockedlist = g_build_filename ("/run/parent",
blockedlist, NULL);
pv_environ_lock_env (container_env, "SHARED_LIBRARY_GUARD_CONFIG",
adjusted_blockedlist);
}
}
} }
else else
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment