diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2014-08-18 13:21:55 -0500 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-08-18 21:01:57 +0200 |
| commit | fe3f22d116f6f0cac3bdfa512ac54c0faf8bb7cd (patch) | |
| tree | 9aaa2dc5b7a119be93e8e14b3d8a7a3404e3078c /src/libsystemd/sd-bus/bus-kernel.c | |
| parent | a1d4404f9ab20159d88fbe9b4ed9a4f3f5b8345e (diff) | |
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.
Diffstat (limited to 'src/libsystemd/sd-bus/bus-kernel.c')
| -rw-r--r-- | src/libsystemd/sd-bus/bus-kernel.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index d384f846b9..3ca271c704 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -542,11 +542,9 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k) { m->creds.cgroup = d->str; m->creds.mask |= (SD_BUS_CREDS_CGROUP|SD_BUS_CREDS_UNIT|SD_BUS_CREDS_USER_UNIT|SD_BUS_CREDS_SLICE|SD_BUS_CREDS_SESSION|SD_BUS_CREDS_OWNER_UID) & bus->creds_mask; - 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; m->creds.cgroup_root = bus->cgroup_root; |