varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsysprof-analyze: try /var/run/host in flatpak/podman

Browse Source 
In podman (at least with toolbox) it appears to give access to home via
/var/run/host/home/ so we don't need to translate home paths at all.

However, Flatpak does not give you home access via that path so we just
have to hope that we have access to $HOME from whatever application
mount namespace we're running from. That means to do symbolizing in a
Flatpak app you'd likely need --filesystem=host to be useful.
This commit is contained in:
Christian Hergert
2023-05-19 13:33:41 -07:00
parent aa829f8665
commit cb74b88b1b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libsysprof-analyze/sysprof-elf-loader.c
View File

@ -43,6 +43,8 @@ enum {
G_DEFINE_FINAL_TYPE (SysprofElfLoader, sysprof_elf_loader, G_TYPE_OBJECT)
static GParamSpec *properties [N_PROPS];
static gboolean in_flatpak;
static gboolean in_podman;
SysprofElfLoader *
sysprof_elf_loader_new (void)
@ -127,6 +129,9 @@ sysprof_elf_loader_class_init (SysprofElfLoaderClass *klass)
(G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, N_PROPS, properties);
in_flatpak = g_file_test ("/.flatpak-info", G_FILE_TEST_EXISTS);
in_podman = g_file_test ("/run/.containerenv", G_FILE_TEST_EXISTS);
}
static void
@ -293,9 +298,13 @@ sysprof_elf_loader_load (SysprofElfLoader *self,
g_autoptr(GMappedFile) mapped_file = NULL;
g_autoptr(SysprofElf) elf = NULL;
g_autoptr(GError) local_error = NULL;
g_autofree char *container_path = NULL;
const char *path = paths[i];
const char *debug_link;
if ((in_flatpak && !g_str_has_prefix (path, "/home/")) || in_podman)
path = container_path = g_build_filename ("/var/run/host", path, NULL);
if (!(mapped_file = g_mapped_file_new (path, FALSE, NULL)))
continue;