diff --git a/src/runtime.c b/src/runtime.c index c795d7d6ebc5a7d27915bad75dd8ad6cdea3e63f..20133cf91f831ba8cbdcb7b930d583f2e7015120 100644 --- a/src/runtime.c +++ b/src/runtime.c @@ -104,6 +104,8 @@ static const char * const libquals[] = static gboolean pv_runtime_use_host_graphics_stack (PvRuntime *self, FlatpakBwrap *bwrap, GError **error); +static void pv_runtime_set_search_paths (PvRuntime *self, + FlatpakBwrap *bwrap); static void pv_runtime_init (PvRuntime *self) @@ -1760,6 +1762,10 @@ pv_runtime_bind (PvRuntime *self, g_return_val_if_fail (!pv_bwrap_was_finished (bwrap), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + /* Start with just the root tmpfs (which appears automatically) + * and the standard API filesystems */ + pv_bwrap_add_api_filesystems (bwrap); + if (!bind_runtime (self, bwrap, error)) return FALSE; @@ -1772,6 +1778,8 @@ pv_runtime_bind (PvRuntime *self, "/run/pressure-vessel", NULL); + pv_runtime_set_search_paths (self, bwrap); + return TRUE; } diff --git a/src/runtime.h b/src/runtime.h index 05d480e515cebc3d510b793b82c0a3c703420fab..5eef8b552e2a09b2ac6f0a204eca88ab9e5dd2cc 100644 --- a/src/runtime.h +++ b/src/runtime.h @@ -47,8 +47,6 @@ PvRuntime *pv_runtime_new (const char *source_files, void pv_runtime_append_lock_adverb (PvRuntime *self, FlatpakBwrap *bwrap); -void pv_runtime_set_search_paths (PvRuntime *self, - FlatpakBwrap *bwrap); gboolean pv_runtime_bind (PvRuntime *self, FlatpakBwrap *bwrap, GError **error); diff --git a/src/wrap.c b/src/wrap.c index f5ce983c249a0d6c59aea917aa47bb09b27a1ecf..2c5232335853c74d4bd8fe18fbf06d960eca8c54 100644 --- a/src/wrap.c +++ b/src/wrap.c @@ -1026,15 +1026,9 @@ main (int argc, tools_dir, error); - /* Start with just the root tmpfs (which appears automatically) - * and the standard API filesystems */ - pv_bwrap_add_api_filesystems (bwrap); - if (runtime == NULL) goto out; - pv_runtime_set_search_paths (runtime, bwrap); - if (!pv_runtime_bind (runtime, bwrap, error)) goto out; }