chiark / gitweb /
journald: fix _SYSTEMD_CGROUP= values
authorLennart Poettering <lennart@poettering.net>
Tue, 3 Jan 2012 22:41:55 +0000 (23:41 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 3 Jan 2012 22:41:55 +0000 (23:41 +0100)
src/journal/journald.c

index 1faf570..b42be8d 100644 (file)
@@ -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)) {