From 87e5c7e6fb51cd811e99bf983d6f75105c562121 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 18 Aug 2011 16:10:50 +0000
Subject: [PATCH] Enable options useful for lxc - linux containers. Changing
 only 3.0/3.1

svn path=/nixpkgs/trunk/; revision=28666
---
 pkgs/os-specific/linux/kernel/linux-3.0.nix | 7 +++++++
 pkgs/os-specific/linux/kernel/linux-3.1.nix | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index d8a325a8b323..94e43a01134c 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -184,6 +184,13 @@ let
       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}
     '';
diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix
index ef5623ec41b0..977489352dea 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix
@@ -184,6 +184,13 @@ let
       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}
     '';