X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fvserver%2FKconfig;h=5f12bc24841269398c4dbe421bcb38ff03c98b15;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=635d8d48813fca076e494ade099a00913a55f5b4;hpb=b76fcd5f0c655b6e3e9bf534594357025421c66a;p=linux-2.6.git

diff --git a/kernel/vserver/Kconfig b/kernel/vserver/Kconfig
index 635d8d488..5f12bc248 100644
--- 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,7 +21,17 @@ config	VSERVER_LEGACY
 	  This enables the legacy API used in vs1.xx, which allows
 	  to use older tools (for migration purposes).
 
-config	PROC_SECURE
+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
 	default y
@@ -25,9 +45,19 @@ 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_GID24
+	default	INOXID_UGID24
 	help
 	  This adds persistent context information to filesystems
 	  mounted with the tagxid option. Tagging is a requirement
@@ -39,26 +69,31 @@ config	INOXID_NONE
 	help
 	  no context information is store for inodes
 
+config	INOXID_UID16
+	bool	"UID16/GID32"
+	help
+	  reduces UID to 16 bit, but leaves GID at 32 bit.
+
 config	INOXID_GID16
 	bool	"UID32/GID16"
 	help
 	  reduces GID to 16 bit, but leaves UID at 32 bit.
 
-config	INOXID_GID24
+config	INOXID_UGID24
 	bool	"UID24/GID24"
 	help
 	  uses the upper 8bit from UID and GID for XID tagging
 	  which leaves 24bit for UID/GID each, which should be
 	  more than sufficient for normal use.
 
-config	INOXID_GID32
+config	INOXID_INTERN
 	bool	"UID32/GID32"
 	help
 	  this uses otherwise reserved inode fields in the on
 	  disk representation, which limits the use to a few
 	  filesystems (currently ext2 and ext3)
 
-config	INOXID_MAGIC
+config	INOXID_RUNTIME
 	bool	"Runtime"
 	depends on EXPERIMENTAL
 	help
@@ -68,5 +103,32 @@ config	INOXID_MAGIC
 
 endchoice
 
+config	VSERVER_DEBUG
+	bool	"Compile Debugging Code"
+	default n
+	help
+	  Set this to yes if you want to be able to activate
+	  debugging output at runtime. It adds a probably small
+	  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