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

exports: Expose /var/usrlocal if "--filesystem=host" is specified


/usr/local points to ../var/usrlocal on Fedora Silverblue.
Originally Flatpak commits 3aaea7d2 and 97d1eb84, thanks to Casey Jao
and Alexander Larsson.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 0dc3a3fe
No related branches found
No related tags found
1 merge request!341flatpak-exports: Update to flatpak 1.11.2
......@@ -390,6 +390,13 @@ flatpak_exports_append_bwrap_args (FlatpakExports *exports,
flatpak_bwrap_add_args (bwrap,
os_bind_mode, "/usr", "/run/host/usr", NULL);
/* /usr/local points to ../var/usrlocal on ostree systems,
so bind-mount that too. */
if (flatpak_exports_stat_in_host (exports, "/var/usrlocal", &buf, 0, NULL) &&
S_ISDIR (buf.st_mode))
flatpak_bwrap_add_args (bwrap,
os_bind_mode, "/var/usrlocal", "/run/host/var/usrlocal", NULL);
for (i = 0; flatpak_abs_usrmerged_dirs[i] != NULL; i++)
{
const char *subdir = flatpak_abs_usrmerged_dirs[i];
......
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