diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-04-16 04:36:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-04-16 04:41:21 +0200 |
| commit | 7027ff61a34a12487712b382a061c654acc3a679 (patch) | |
| tree | 05e9374a566d6accdd962dd4dc6d7076b9304122 /src/core/dbus-unit.c | |
| parent | cec4ead904978b07db2154c618eeb48d3102da66 (diff) | |
nspawn: introduce the new /machine/ tree in the cgroup tree and move containers there
Containers will now carry a label (normally derived from the root
directory name, but configurable by the user), and the container's root
cgroup is /machine/<label>. This label is called "machine name", and can
cover both containers and VMs (as soon as libvirt also makes use of
/machine/).
libsystemd-login can be used to query the machine name from a process.
This patch also includes numerous clean-ups for the cgroup code.
Diffstat (limited to 'src/core/dbus-unit.c')
| -rw-r--r-- | src/core/dbus-unit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index 5f1b2afd5b..8c1ce61151 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -1034,7 +1034,7 @@ int bus_unit_cgroup_unset(Unit *u, DBusMessageIter *iter) { unit_remove_drop_in(u, runtime, controller); /* Try to migrate the old group away */ - if (cg_get_by_pid(controller, 0, &target) >= 0) + if (cg_pid_get_path(controller, 0, &target) >= 0) cgroup_bonding_migrate_to(u->cgroup_bondings, target, false); cgroup_bonding_free(b, true); |