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

pv_bwrap_add_api_filesystems: Factor out

parent 77f3e3d7
No related branches found
No related tags found
No related merge requests found
......@@ -379,3 +379,29 @@ pv_bwrap_copy_tree (FlatpakBwrap *bwrap,
nftw_data.source = NULL;
nftw_data.dest = NULL;
}
/**
* pv_bwrap_add_api_filesystems:
* @bwrap: The #FlatpakBwrap
*
* Make basic API filesystems available.
*/
void
pv_bwrap_add_api_filesystems (FlatpakBwrap *bwrap)
{
flatpak_bwrap_add_args (bwrap,
"--dev-bind", "/dev", "/dev",
"--proc", "/proc",
"--ro-bind", "/sys", "/sys",
NULL);
if (g_file_test ("/dev/pts", G_FILE_TEST_EXISTS))
flatpak_bwrap_add_args (bwrap,
"--dev-bind", "/dev/pts", "/dev/pts",
NULL);
if (g_file_test ("/dev/shm", G_FILE_TEST_EXISTS))
flatpak_bwrap_add_args (bwrap,
"--dev-bind", "/dev/shm", "/dev/shm",
NULL);
}
......@@ -39,6 +39,7 @@ gboolean pv_bwrap_bind_usr (FlatpakBwrap *bwrap,
void pv_bwrap_copy_tree (FlatpakBwrap *bwrap,
const char *source,
const char *dest);
void pv_bwrap_add_api_filesystems (FlatpakBwrap *bwrap);
static inline gboolean
pv_bwrap_was_finished (FlatpakBwrap *bwrap)
......
......@@ -1605,22 +1605,7 @@ main (int argc,
if (opt_terminal != PV_TERMINAL_TTY)
flatpak_bwrap_add_arg (bwrap, "--new-session");
/* Make basic API filesystems available */
flatpak_bwrap_add_args (bwrap,
"--dev-bind", "/dev", "/dev",
"--proc", "/proc",
"--ro-bind", "/sys", "/sys",
NULL);
if (g_file_test ("/dev/pts", G_FILE_TEST_EXISTS))
flatpak_bwrap_add_args (bwrap,
"--dev-bind", "/dev/pts", "/dev/pts",
NULL);
if (g_file_test ("/dev/shm", G_FILE_TEST_EXISTS))
flatpak_bwrap_add_args (bwrap,
"--dev-bind", "/dev/shm", "/dev/shm",
NULL);
pv_bwrap_add_api_filesystems (bwrap);
if (opt_runtime != NULL && opt_runtime[0] != '\0')
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment