chiark / gitweb /
Prep v232.2: cg_shift_path() : With other controllers, elogind might end up in name...
authorSven Eden <yamakuzure@gmx.net>
Wed, 5 Jul 2017 12:53:38 +0000 (14:53 +0200)
committerSven Eden <yamakuzure@gmx.net>
Wed, 5 Jul 2017 12:53:38 +0000 (14:53 +0200)
src/basic/cgroup-util.c

index 2c7ceb7..44ab535 100644 (file)
@@ -1329,7 +1329,11 @@ int cg_shift_path(const char *cgroup, const char *root, const char **shifted) {
         }
 
         p = path_startswith(cgroup, root);
+#if 0 /// With other controllers, elogind might end up in /elogind, and *p is 0
         if (p && p > cgroup)
+#else
+        if (p && p[0] && (p > cgroup))
+#endif // 0
                 *shifted = p - 1;
         else
                 *shifted = cgroup;