Merge to VServer 1.9.0

[linux-2.6.git] / configs / kernel-2.6.6-i686.config

diff --git a/configs/kernel-2.6.6-i686.config b/configs/kernel-2.6.6-i686.config
index c245c3d..f416d4c 100644 (file)
--- a/configs/kernel-2.6.6-i686.config
+++ b/configs/kernel-2.6.6-i686.config
@@ -2314,6 +2314,18 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
 # CONFIG_FRAME_POINTER is not set
 
+#
+# Linux VServer
+#
+CONFIG_VSERVER_LEGACY=y
+CONFIG_PROC_SECURE=y
+# CONFIG_VSERVER_HARDCPU is not set
+# CONFIG_INOXID_NONE is not set
+# CONFIG_INOXID_GID16 is not set
+CONFIG_INOXID_GID24=y
+# CONFIG_INOXID_GID32 is not set
+# CONFIG_INOXID_MAGIC is not set
+
 #
 # Security options
 #