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: include mount root when translating

Browse Source 
Additionally, if we're on a subvolume, and that subvolume matches the
prefix of the root, then skip past that. I have no idea if this is the
right thing to do, but it's what we were doing before and seems to be
able to help us get proper path resolving on Silverblue.
This commit is contained in:
Christian Hergert
2023-05-23 15:39:27 -07:00
parent 5ef6911d65
commit 5bf178e07b
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libsysprof-analyze/sysprof-mount-namespace.c
View File

@ -266,17 +266,31 @@ sysprof_mount_namespace_translate (SysprofMountNamespace *self,
if (!(relative = _sysprof_mount_get_relative_path (mount, file)))
continue;
if (!mount->is_overlay)
if (mount->is_overlay)
{
translated = g_build_filename (mount->mount_source, relative, NULL);
}
else
{
const char *root;
const char *subvolume;
if (!(device = sysprof_mount_namespace_find_device (self, mount, relative)))
continue;
device_mount_point = sysprof_mount_device_get_mount_point (device);
translated = g_build_filename (device_mount_point, relative, NULL);
}
else
{
translated = g_build_filename (mount->mount_source, relative, NULL);
root = sysprof_mount_get_root (mount);
subvolume = sysprof_mount_device_get_subvolume (device);
if (root != NULL && subvolume != NULL)
{
if (g_strcmp0 (root, subvolume) == 0)
root = "/";
else if (g_str_has_prefix (root, subvolume) && root[strlen (subvolume)] == '/')
root += strlen (subvolume);
}
translated = g_build_filename (device_mount_point, root, relative, NULL);
}
g_array_append_val (strv, translated);