summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/common-config.nix
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2018-11-13 01:13:00 +0000
committerOrivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com>2018-11-13 01:13:00 +0000
commit08d98b2e3814e5c6b4832f335897d482db6d361d (patch)
treeae73507819d4390693d4bd0752acf2856b476375 /pkgs/os-specific/linux/kernel/common-config.nix
parentf19bb8321aad93efd9c024f9b7f6eca49db1d4c8 (diff)
downloadnixpkgs-08d98b2e3814e5c6b4832f335897d482db6d361d.tar
nixpkgs-08d98b2e3814e5c6b4832f335897d482db6d361d.tar.gz
nixpkgs-08d98b2e3814e5c6b4832f335897d482db6d361d.tar.bz2
nixpkgs-08d98b2e3814e5c6b4832f335897d482db6d361d.tar.lz
nixpkgs-08d98b2e3814e5c6b4832f335897d482db6d361d.tar.xz
nixpkgs-08d98b2e3814e5c6b4832f335897d482db6d361d.tar.zst
nixpkgs-08d98b2e3814e5c6b4832f335897d482db6d361d.zip
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
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix7
1 files changed, 5 insertions, 2 deletions
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;