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

Merge branch 'fix-flatpak-filesystem-host' into 'master'

Browse Source 
elfparser: Try original filename too

See merge request GNOME/sysprof!44
This commit is contained in:
Christian Hergert
2021-10-08 17:47:30 +00:00
parent b113c89af1 3b180b313b
commit 56b4520603
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libsysprof/elfparser.c
View File

@ -278,13 +278,21 @@ static GMappedFile *
open_mapped_file (const char *filename,
GError **error)
{
GMappedFile *file;
GMappedFile *file = NULL;
char *alternate = NULL;
if (in_container () && !g_str_has_prefix (filename, g_get_home_dir ()))
filename = alternate = g_build_filename ("/var/run/host", filename, NULL);
file = g_mapped_file_new (filename, FALSE, error);
g_free (alternate);
{
alternate = g_build_filename ("/var/run/host", filename, NULL);
file = g_mapped_file_new (alternate, FALSE, NULL);
g_free (alternate);
}
/* Flatpaks with filesystem=host don't have Silverblue's /sysroot in /var/run/host,
* yet they have it in /, which means the original path might work.
*/
if (!file)
file = g_mapped_file_new (filename, FALSE, error);
return file;
}