vserver 2.0-rc4

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

diff --git a/kernel/vserver/Kconfig b/kernel/vserver/Kconfig
index 5160a01..09cf933 100644 (file)
--- a/kernel/vserver/Kconfig
+++ b/kernel/vserver/Kconfig
@@ -2,6 +2,21 @@
 # Linux VServer configuration
 #
 
+config VSERVER
+       bool
+       default y
+
+config VSERVER_SECURITY
+       bool
+       depends on SECURITY
+       default y
+       select SECURITY_CAPABILITIES
+
+config VSERVER_LEGACYNET
+       bool
+       depends on !VSERVER_NGNET
+       default y
+
 menu "Linux VServer"
 
 config VSERVER_LEGACY
@@ -11,6 +26,15 @@ config       VSERVER_LEGACY
          This enables the legacy API used in vs1.xx, which allows
          to use older tools (for migration purposes).
 
+config VSERVER_NGNET
+       bool    "Disable Legacy Networking Kernel API"
+       depends on EXPERIMENTAL
+       default n
+       help
+         This disables the legacy networking API which is required
+         by the chbind tool. Do not disable it unless you exactly
+         know what you are doing.
+
 config VSERVER_PROC_SECURE
        bool    "Enable Proc Security"
        depends on PROC_FS
@@ -25,6 +49,16 @@ config       VSERVER_HARDCPU
        help
          Activate the Hard CPU Limits
 
+config VSERVER_HARDCPU_IDLE
+       bool    "Limit the IDLE task"
+       depends on VSERVER_HARDCPU
+       default n
+       help
+         Limit the idle slices, so the the next context
+         will be scheduled as soon as possible.
+         might improve interactivity/latency but
+         increases scheduling overhead.
+
 choice
        prompt  "Persistent Inode Context Tagging"
        default INOXID_UGID24
@@ -73,8 +107,16 @@ config      INOXID_RUNTIME
 
 endchoice
 
+config XID_TAG_NFSD
+       bool    "Tag NFSD User Auth and Files"
+       default n
+       help
+         Enable this if you do want the kernel nfsd to
+         use the xid tagging specified above.
+         (will require patched clients too)
+
 config VSERVER_DEBUG
-       bool    "Compile Debugging Code"
+       bool    "VServer Debugging Code"
        default n
        help
          Set this to yes if you want to be able to activate
@@ -82,5 +124,23 @@ config      VSERVER_DEBUG
          overhead (~ ??%) to all vserver related functions and
          increases the kernel size by about 20k.
 
+config VSERVER_HISTORY
+       bool    "VServer 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