From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 5 Nov 2023 17:42:29 +0000 (+0000)
Subject: jail: Don't fail if cgroup stats could not be read
X-Git-Tag: 0.9.30~1307
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec64b312b6a6aadd47f01ae8039f51bb9d9d99b6;p=pakfire.git

jail: Don't fail if cgroup stats could not be read

This is kind of a fire and forget situation, but should be good enough.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c
index c7e314afe..8821dd9c4 100644
--- a/src/libpakfire/jail.c
+++ b/src/libpakfire/jail.c
@@ -2230,17 +2230,9 @@ static int __pakfire_jail_exec(struct pakfire_jail* jail, const char* argv[],
 ERROR:
 	// Destroy the temporary cgroup (if any)
 	if (ctx.cgroup) {
-#if 0
-		// XXX this is currently disabled because it overwrites r
 		// Read cgroup stats
-		r = pakfire_cgroup_stat(ctx.cgroup, &ctx.cgroup_stats);
-		if (r) {
-			ERROR(jail->pakfire, "Could not read cgroup stats: %m\n");
-		} else {
-			pakfire_cgroup_stat_dump(ctx.cgroup, &ctx.cgroup_stats);
-		}
-#endif
-
+		pakfire_cgroup_stat(ctx.cgroup, &ctx.cgroup_stats);
+		pakfire_cgroup_stat_dump(ctx.cgroup, &ctx.cgroup_stats);
 		pakfire_cgroup_destroy(ctx.cgroup);
 		pakfire_cgroup_unref(ctx.cgroup);
 	}