vserver 1.9.5.x5

[linux-2.6.git] / kernel / vserver / Kconfig

diff --git a/kernel/vserver/Kconfig b/kernel/vserver/Kconfig
index aea29b2..5f12bc2 100644 (file)
--- a/kernel/vserver/Kconfig
+++ b/kernel/vserver/Kconfig
@@ -2,6 +2,16 @@
 # Linux VServer configuration
 #
 
+config VSERVER
+       bool
+       default y
+
+config VSERVER_SECURITY
+       bool
+       depends on SECURITY
+       default y
+       select SECURITY_CAPABILITIES
+
 menu "Linux VServer"
 
 config VSERVER_LEGACY
@@ -11,6 +21,16 @@ config       VSERVER_LEGACY
          This enables the legacy API used in vs1.xx, which allows
          to use older tools (for migration purposes).
 
+config VSERVER_LEGACYNET
+       bool    "Enable Legacy Networking Kernel API"
+       default y
+       help
+         This enables the legacy networking API, which allows
+         to configure per vserver IPs as we know it.
+         For now, even recent tools use this interface of the
+         legacy API, so unless you know what you are doing,
+         leave that option enabled.
+
 config VSERVER_PROC_SECURE
        bool    "Enable Proc Security"
        depends on PROC_FS
@@ -92,5 +112,23 @@ config      VSERVER_DEBUG
          overhead (~ ??%) to all vserver related functions and
          increases the kernel size by about 20k.
 
+config VSERVER_HISTORY
+       bool    "Compile History Tracing"
+       depends on VSERVER_DEBUG
+       default n
+       help
+         Set this to yes if you want to record the history of
+         linux-vserver activities, so they can be replayed on
+         a kernel panic (oops)
+
+config VSERVER_HISTORY_SIZE
+       int "Per CPU History Size (32-65536)"
+       depends on VSERVER_HISTORY
+       range 32 65536
+       default 64
+       help
+         This allows you to specify the number of entries in
+         the per CPU history buffer.
+
 endmenu