From df0eafd5a4a7aac86c0e8d670e7fec8254f167d9 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Tue, 27 Jul 2021 10:25:44 +0100 Subject: [PATCH] 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: Simon McVittie <smcv@collabora.com> --- pressure-vessel/flatpak-exports.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pressure-vessel/flatpak-exports.c b/pressure-vessel/flatpak-exports.c index 6544cfac8..c951f307e 100644 --- a/pressure-vessel/flatpak-exports.c +++ b/pressure-vessel/flatpak-exports.c @@ -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]; -- GitLab