From fe3f22d116f6f0cac3bdfa512ac54c0faf8bb7cd Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Mon, 18 Aug 2014 13:21:55 -0500 Subject: bus-control: Fix cgroup handling On systems without properly setup systemd, cg_get_root_path returns -ENOENT. This means that busctl doesn't display much information. busctl monitor also fails whenever it intercepts messages. This fix fakes creates a fake "/" root cgroup which lets busctl work on such systems. --- src/libsystemd/sd-bus/bus-control.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/libsystemd/sd-bus/bus-control.c') diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index 076bbce6b1..ad372f6772 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -495,11 +495,9 @@ static int bus_get_owner_kdbus( goto fail; } - if (!bus->cgroup_root) { - r = cg_get_root_path(&bus->cgroup_root); - if (r < 0) - goto fail; - } + r = bus_get_root_path(bus); + if (r < 0) + goto fail; c->cgroup_root = strdup(bus->cgroup_root); if (!c->cgroup_root) { -- cgit v1.2.3-54-g00ecf