diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-07-16 11:53:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-16 11:53:31 +0200 |
| commit | f200a3564cbd65e0f8bb58ac715989b41abf0f7d (patch) | |
| tree | 446f03299ff2128596867d0b8dced1f5830aefc2 /src/core | |
| parent | b8fcdba6db25d5372189dff7e33cbfa1a06da56d (diff) | |
| parent | 95b21cff0ee60ae59b6221c89d84f97bcec33ffc (diff) | |
| download | systemd-f200a3564cbd65e0f8bb58ac715989b41abf0f7d.tar.gz | |
Merge pull request #13063 from keszybz/cgroup-path-fixes
Cgroup path fixes
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/cgroup.c | 2 | ||||
| -rw-r--r-- | src/core/dbus-unit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 0428f62481..9a1aec144e 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -2490,7 +2490,7 @@ static int unit_watch_pids_in_path(Unit *u, const char *path) { while ((r = cg_read_subgroup(d, &fn)) > 0) { _cleanup_free_ char *p = NULL; - p = path_join(path, fn); + p = path_join(empty_to_root(path), fn); free(fn); if (!p) diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index 53daa9c2ec..220b4c2372 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -1062,7 +1062,7 @@ static int append_cgroup(sd_bus_message *reply, const char *p, Set *pids) { if (r == 0) break; - j = path_join(p, g); + j = path_join(empty_to_root(p), g); if (!j) return -ENOMEM; |