From 08d98b2e3814e5c6b4832f335897d482db6d361d Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 13 Nov 2018 01:13:00 +0000 Subject: linux: enable CGROUP_HUGETLB, CGROUP_PERF, CGROUP_RDMA (#50225) These options were added in: NAMESPACES 2.6.25 CGROUP_DEVICE 2.6.26 CGROUP_HUGETLB 3.6 CGROUP_PERF 2.6.39 CGROUP_RDMA 4.11 --- pkgs/os-specific/linux/kernel/common-config.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/kernel/common-config.nix') diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 27a615d7bb9..b94e34c8f6c 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -370,9 +370,12 @@ let }; container = { - NAMESPACES = option yes; # Required by 'unshare' used by 'nixos-install' + NAMESPACES = yes; # Required by 'unshare' used by 'nixos-install' RT_GROUP_SCHED = no; - CGROUP_DEVICE = option yes; + CGROUP_DEVICE = yes; + CGROUP_HUGETLB = yes; + CGROUP_PERF = yes; + CGROUP_RDMA = whenAtLeast "4.11" yes; MEMCG = yes; MEMCG_SWAP = yes; -- cgit 1.4.1