diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-09 10:08:44 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-09 10:08:44 +0200 |
| commit | 94766ad2ba705d3d545b2fa87616ca12c0e301ac (patch) | |
| tree | da8d15d04bcc8029556fb32438346e93b265f36b /src/core | |
| parent | 0fa7d1f5be847d4804eb3bf6a4c10333ea14e0bc (diff) | |
| parent | 38c2ef1d55c034c6e06c25f7eff22a651edc5aec (diff) | |
Merge pull request #1210 from poettering/import-fixes
cgroup fix, nspawn fix, plus change to download .nspawn files in importd
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/cgroup.c | 4 | ||||
| -rw-r--r-- | src/core/dbus-cgroup.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 9a025cf929..baa7cc5488 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -404,7 +404,7 @@ void cgroup_context_apply(CGroupContext *c, CGroupMask mask, const char *path, M "Failed to set memory.limit_in_bytes/memory.max on %s: %m", path); } - if ((mask & CGROUP_MASK_DEVICE) && !is_root) { + if ((mask & CGROUP_MASK_DEVICES) && !is_root) { CGroupDeviceAllow *a; /* Changing the devices list of a populated cgroup @@ -492,7 +492,7 @@ CGroupMask cgroup_context_get_mask(CGroupContext *c) { if (c->device_allow || c->device_policy != CGROUP_AUTO) - mask |= CGROUP_MASK_DEVICE; + mask |= CGROUP_MASK_DEVICES; return mask; } diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c index e8fd44e294..ba2f4e53b9 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -572,7 +572,7 @@ int bus_cgroup_set_property( char *buf; c->device_policy = p; - u->cgroup_realized_mask &= ~CGROUP_MASK_DEVICE; + u->cgroup_realized_mask &= ~CGROUP_MASK_DEVICES; buf = strjoina("DevicePolicy=", policy); unit_write_drop_in_private(u, mode, name, buf); @@ -651,7 +651,7 @@ int bus_cgroup_set_property( cgroup_context_free_device_allow(c, c->device_allow); } - u->cgroup_realized_mask &= ~CGROUP_MASK_DEVICE; + u->cgroup_realized_mask &= ~CGROUP_MASK_DEVICES; f = open_memstream(&buf, &size); if (!f) |