varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-12 16:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsysprof-analyze: process lower/upper dir from overlay

Browse Source 
In modern podman, we will get lowerdir= and upperdir= in the superblock
options which we can parse to find where things are on the host. Use that
instead of relying on overlay mounts.
This commit is contained in:
Christian Hergert
2023-05-23 19:49:21 -07:00
parent 5bf178e07b
commit 4926723228
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,16 +260,46 @@ sysprof_mount_namespace_translate (SysprofMountNamespace *self,
SysprofMount *mount = g_ptr_array_index (self->mounts, i); SysprofMount *mount = g_ptr_array_index (self->mounts, i);
SysprofMountDevice *device; SysprofMountDevice *device;
const char *device_mount_point; const char *device_mount_point;
const char *fs_type;
const char *relative; const char *relative;
char *translated; char *translated;
if (!(relative = _sysprof_mount_get_relative_path (mount, file))) if (!(relative = _sysprof_mount_get_relative_path (mount, file)))
continue; continue;
fs_type = sysprof_mount_get_filesystem_type (mount);
if (mount->is_overlay) if (mount->is_overlay)
{ {
translated = g_build_filename (mount->mount_source, relative, NULL); translated = g_build_filename (mount->mount_source, relative, NULL);
} }
else if (g_strcmp0 (fs_type, "overlay") == 0)
{
g_autofree char *lowerdir_str = sysprof_mount_get_superblock_option (mount, "lowerdir");
g_autofree char *upperdir_str = sysprof_mount_get_superblock_option (mount, "upperdir");
g_auto(GStrv) lowerdirs = lowerdir_str ? g_strsplit (lowerdir_str, ":", 0) : NULL;
g_auto(GStrv) upperdirs = upperdir_str ? g_strsplit (upperdir_str, ":", 0) : NULL;
if (upperdirs != NULL)
{
for (guint j = 0; upperdirs[j]; j++)
{
translated = g_build_filename (upperdirs[j], relative, NULL);
g_array_append_val (strv, translated);
}
}
if (lowerdirs != NULL)
{
for (guint j = 0; lowerdirs[j]; j++)
{
translated = g_build_filename (lowerdirs[j], relative, NULL);
g_array_append_val (strv, translated);
}
}
continue;
}
else else
{ {
const char *root; const char *root;