summaryrefslogtreecommitdiff
path: root/common/flatpak-dir.c
diff options
context:
space:
mode:
Diffstat (limited to 'common/flatpak-dir.c')
-rw-r--r--common/flatpak-dir.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index a92da24d..a9b711ee 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -8246,6 +8246,7 @@ apply_extra_data (FlatpakDir *self,
int exit_status;
const char *group = FLATPAK_METADATA_GROUP_APPLICATION;
g_autoptr(GError) local_error = NULL;
+ FlatpakRunFlags run_flags;
apply_extra_file = g_file_resolve_relative_path (checkoutdir, "files/bin/apply_extra");
if (!g_file_query_exists (apply_extra_file, cancellable))
@@ -8322,20 +8323,22 @@ apply_extra_data (FlatpakDir *self,
"--cap-drop", "ALL",
NULL);
+ /* Might need multiarch in apply_extra (see e.g. #3742).
+ * Should be pretty safe in this limited context */
+ run_flags = (FLATPAK_RUN_FLAG_MULTIARCH |
+ FLATPAK_RUN_FLAG_NO_SESSION_HELPER |
+ FLATPAK_RUN_FLAG_NO_PROC |
+ FLATPAK_RUN_FLAG_NO_SESSION_BUS_PROXY |
+ FLATPAK_RUN_FLAG_NO_SYSTEM_BUS_PROXY |
+ FLATPAK_RUN_FLAG_NO_A11Y_BUS_PROXY);
+
if (!flatpak_run_setup_base_argv (bwrap, runtime_files, NULL, runtime_arch,
- /* Might need multiarch in apply_extra (see e.g. #3742). Should be pretty safe in this limited context */
- FLATPAK_RUN_FLAG_MULTIARCH |
- FLATPAK_RUN_FLAG_NO_SESSION_HELPER | FLATPAK_RUN_FLAG_NO_PROC,
- error))
+ run_flags, error))
return FALSE;
app_context = flatpak_context_new ();
- if (!flatpak_run_add_environment_args (bwrap, NULL,
- FLATPAK_RUN_FLAG_NO_SESSION_BUS_PROXY |
- FLATPAK_RUN_FLAG_NO_SYSTEM_BUS_PROXY |
- FLATPAK_RUN_FLAG_NO_A11Y_BUS_PROXY,
- id,
+ if (!flatpak_run_add_environment_args (bwrap, NULL, run_flags, id,
app_context, NULL, NULL, -1,
NULL, cancellable, error))
return FALSE;