Author: raskin
Date: Thu Aug 18 16:10:50 2011
New Revision: 28666
URL: https://svn.nixos.org/websvn/nix/?rev=28666&sc=1
Log:
Enable options useful for lxc - linux containers. Changing only 3.0/3.1
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix Thu Aug 18
15:01:53 2011 (r28665)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.0.nix Thu Aug 18
16:10:50 2011 (r28666)
@@ -184,6 +184,13 @@
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
+ # Linux Containers
+ RT_GROUP_SCHED? y
+ CGROUP_DEVICE? y
+ CGROUP_MEM_RES_CTLR? y
+ CGROUP_MEM_RES_CTLR_SWAP? y
+ DEVPTS_MULTIPLE_INSTANCES? y
+
${if kernelPlatform ? kernelExtraConfig then
kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix Thu Aug 18
15:01:53 2011 (r28665)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-3.1.nix Thu Aug 18
16:10:50 2011 (r28666)
@@ -184,6 +184,13 @@
X86_CHECK_BIOS_CORRUPTION y
X86_MCE y
+ # Linux Containers
+ RT_GROUP_SCHED? y
+ CGROUP_DEVICE? y
+ CGROUP_MEM_RES_CTLR? y
+ CGROUP_MEM_RES_CTLR_SWAP? y
+ DEVPTS_MULTIPLE_INSTANCES? y
+
${if kernelPlatform ? kernelExtraConfig then
kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
