From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 3 Jan 2012 22:41:55 +0000 (+0100)
Subject: journald: fix _SYSTEMD_CGROUP= values
X-Git-Tag: v38~90
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=bad75c274a488715a845ff8e5ec3140036929e94

journald: fix _SYSTEMD_CGROUP= values
---

diff --git a/src/journal/journald.c b/src/journal/journald.c
index 1faf57016..b42be8d7a 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -391,7 +391,9 @@ static char *shortened_cgroup_path(pid_t pid) {
                 return NULL;
         }
 
-        if (streq(init_path, "/"))
+        if (endswith(init_path, "/system"))
+                init_path[strlen(init_path) - 7] = 0;
+        else if (streq(init_path, "/"))
                 init_path[0] = 0;
 
         if (startswith(process_path, init_path)) {