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/sd-bus.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/libsystemd/sd-bus/sd-bus.c') diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 83233fd7e6..a204d67590 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -3358,3 +3358,21 @@ _public_ int sd_bus_get_name(sd_bus *bus, const char **name) { *name = bus->connection_name; return 0; } + +int bus_get_root_path(sd_bus *bus) { + int r; + + if (bus->cgroup_root) + return 0; + + r = cg_get_root_path(&bus->cgroup_root); + if (r == -ENOENT) { + bus->cgroup_root = strdup("/"); + if (!bus->cgroup_root) + return -ENOMEM; + + r = 0; + } + + return r; +} -- cgit v1.2.3-54-g00ecf