From 2a50d4724c0938a7a1af91556e0229263139ad54 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Wed, 5 Jul 2017 14:53:38 +0200 Subject: Prep v232.2: cg_shift_path() : With other controllers, elogind might end up in name=foo:/elogind, where cgroup and root are both /elogind. --- src/basic/cgroup-util.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/basic') diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 2c7ceb71d..44ab535cc 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -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; -- cgit v1.2.3