X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fvserver%2FKconfig;h=5160a01352d5f7ecbcc3b4123112d5cfbe557735;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=635d8d48813fca076e494ade099a00913a55f5b4;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/kernel/vserver/Kconfig b/kernel/vserver/Kconfig
index 635d8d488..5160a0135 100644
--- a/kernel/vserver/Kconfig
+++ b/kernel/vserver/Kconfig
@@ -11,7 +11,7 @@ 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_PROC_SECURE
 	bool	"Enable Proc Security"
 	depends on PROC_FS
 	default y
@@ -27,7 +27,7 @@ config	VSERVER_HARDCPU
 
 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 +39,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 +73,14 @@ 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.
+
 endmenu