From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 5 Sep 2017 17:20:29 +0000 (+0200)
Subject: core: make sure to dump cgroup context when unit_dump() is called for all unit types
X-Git-Tag: v235~60^2~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18f573aaf9802ddac494c94a59968e0b34155695;p=thirdparty%2Fsystemd.git

core: make sure to dump cgroup context when unit_dump() is called for all unit types

For some reason we didn't dump the cgroup context for a number of unit
types, including service units. Not sure how this wasn't noticed
before... Add this in.
---

diff --git a/src/core/mount.c b/src/core/mount.c
index c3805ee055f..472f54242cd 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -736,6 +736,7 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) {
 
         exec_context_dump(&m->exec_context, f, prefix);
         kill_context_dump(&m->kill_context, f, prefix);
+        cgroup_context_dump(&m->cgroup_context, f, prefix);
 }
 
 static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) {
diff --git a/src/core/service.c b/src/core/service.c
index c9a7222cc64..2144884f9e0 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -803,6 +803,8 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
                         "%sFile Descriptor Store Current: %u\n",
                         prefix, s->n_fd_store_max,
                         prefix, s->n_fd_store);
+
+        cgroup_context_dump(&s->cgroup_context, f, prefix);
 }
 
 static int service_load_pid_file(Service *s, bool may_warn) {
diff --git a/src/core/socket.c b/src/core/socket.c
index 9d8367e90bd..a82e7d21870 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -852,6 +852,8 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
 
                 exec_command_dump_list(s->exec_command[c], f, prefix2);
         }
+
+        cgroup_context_dump(&s->cgroup_context, f, prefix);
 }
 
 static int instance_from_socket(int fd, unsigned nr, char **instance) {
diff --git a/src/core/swap.c b/src/core/swap.c
index 9553ee16a83..303f62d25af 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -602,6 +602,7 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) {
 
         exec_context_dump(&s->exec_context, f, prefix);
         kill_context_dump(&s->kill_context, f, prefix);
+        cgroup_context_dump(&s->cgroup_context, f, prefix);
 }
 
 static int swap_spawn(Swap *s, ExecCommand *c, pid_t *_pid) {