From 58204b51f3028ecb83a64b0366741c276bed6f3a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 26 May 2021 19:24:24 +0100
Subject: [PATCH] system-info: Show /overrides even if in scout runtime

This is helpful if we're stacking the scout runtime onto the soldier
runtime: both pinned_libs_* and overrides are relevant there.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 bin/system-info.c                 | 7 ++++---
 steam-runtime-tools/system-info.c | 7 -------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/bin/system-info.c b/bin/system-info.c
index 23de35f6a..cf0dcf3e6 100644
--- a/bin/system-info.c
+++ b/bin/system-info.c
@@ -972,10 +972,11 @@ main (int argc,
       jsonify_runtime_issues (builder, runtime_issues);
       json_builder_end_array (builder);
 
-      if (g_strcmp0 (rt_path, "/") == 0)
-        {
-          overrides = srt_system_info_list_pressure_vessel_overrides (info, &messages);
+      overrides = srt_system_info_list_pressure_vessel_overrides (info, &messages);
 
+      if ((overrides != NULL && overrides[0] != NULL)
+          || (messages != NULL && messages[0] != NULL))
+        {
           json_builder_set_member_name (builder, "overrides");
           json_builder_begin_object (builder);
 
diff --git a/steam-runtime-tools/system-info.c b/steam-runtime-tools/system-info.c
index 67b2b2b19..280c3df24 100644
--- a/steam-runtime-tools/system-info.c
+++ b/steam-runtime-tools/system-info.c
@@ -1234,17 +1234,10 @@ ensure_overrides_cached (SrtSystemInfo *self)
           "overrides/",
           "usr/lib/pressure-vessel/overrides/",
       };
-      g_autofree gchar *runtime = NULL;
       gsize i;
 
       self->overrides.have_data = TRUE;
 
-      runtime = srt_system_info_dup_runtime_path (self);
-      /* Skip checking the overridden folder if we are not in a pressure-vessel
-       * Steam Runtime container */
-      if (g_strcmp0 (runtime, "/") != 0)
-        return;
-
       for (i = 0; i < G_N_ELEMENTS (paths); i++)
         {
           if (_srt_file_test_in_sysroot (self->sysroot, self->sysroot_fd,
-- 
GitLab