Skip to content
Snippets Groups Projects
Commit 183124bc authored by Ludovico de Nittis's avatar Ludovico de Nittis
Browse files

Merge branch 'wip/smcv/runshm' into 'master'

Fix interop with older Upstart- and sysvinit-based OSs

See merge request !325
parents 60943b8a 738be4c6
No related branches found
No related tags found
1 merge request!325Fix interop with older Upstart- and sysvinit-based OSs
...@@ -350,21 +350,31 @@ pv_bwrap_copy_tree (FlatpakBwrap *bwrap, ...@@ -350,21 +350,31 @@ pv_bwrap_copy_tree (FlatpakBwrap *bwrap,
void void
pv_bwrap_add_api_filesystems (FlatpakBwrap *bwrap) pv_bwrap_add_api_filesystems (FlatpakBwrap *bwrap)
{ {
g_autofree char *link = NULL;
flatpak_bwrap_add_args (bwrap, flatpak_bwrap_add_args (bwrap,
"--dev-bind", "/dev", "/dev", "--dev-bind", "/dev", "/dev",
"--proc", "/proc", "--proc", "/proc",
"--ro-bind", "/sys", "/sys", "--ro-bind", "/sys", "/sys",
NULL); NULL);
if (g_file_test ("/dev/pts", G_FILE_TEST_EXISTS)) link = glnx_readlinkat_malloc (AT_FDCWD, "/dev/shm", NULL, NULL);
flatpak_bwrap_add_args (bwrap,
"--dev-bind", "/dev/pts", "/dev/pts",
NULL);
if (g_file_test ("/dev/shm", G_FILE_TEST_EXISTS)) if (g_strcmp0 (link, "/run/shm") == 0)
flatpak_bwrap_add_args (bwrap, {
"--dev-bind", "/dev/shm", "/dev/shm", if (g_file_test ("/run/shm", G_FILE_TEST_IS_DIR))
NULL); flatpak_bwrap_add_args (bwrap,
"--bind", "/run/shm", "/run/shm",
NULL);
else
flatpak_bwrap_add_args (bwrap,
"--dir", "/run/shm",
NULL);
}
else if (link != NULL)
{
g_warning ("Unexpected /dev/shm symlink %s", link);
}
} }
FlatpakBwrap * FlatpakBwrap *
......
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