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/basic/cgroup-util.c | |
| 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/basic/cgroup-util.c')
| -rw-r--r-- | src/basic/cgroup-util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index f661a54d99..94a25585b2 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -2211,7 +2211,7 @@ static const char *cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = { [CGROUP_CONTROLLER_CPUACCT] = "cpuacct", [CGROUP_CONTROLLER_BLKIO] = "blkio", [CGROUP_CONTROLLER_MEMORY] = "memory", - [CGROUP_CONTROLLER_DEVICE] = "devices", + [CGROUP_CONTROLLER_DEVICES] = "devices", }; DEFINE_STRING_TABLE_LOOKUP(cgroup_controller, CGroupController); |