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

diff --git a/kernel/vserver/Kconfig b/kernel/vserver/Kconfig
index 5f12bc248..09cf93347 100644
--- a/kernel/vserver/Kconfig
+++ b/kernel/vserver/Kconfig
@@ -12,6 +12,11 @@ config	VSERVER_SECURITY
 	default y
 	select SECURITY_CAPABILITIES
 
+config	VSERVER_LEGACYNET
+	bool
+	depends on !VSERVER_NGNET
+	default y
+
 menu "Linux VServer"
 
 config	VSERVER_LEGACY
@@ -21,15 +26,14 @@ 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
+config	VSERVER_NGNET
+	bool	"Disable Legacy Networking Kernel API"
+	depends on EXPERIMENTAL
+	default n
 	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.
+	  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"
@@ -103,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
@@ -113,7 +125,7 @@ config	VSERVER_DEBUG
 	  increases the kernel size by about 20k.
 
 config	VSERVER_HISTORY
-	bool	"Compile History Tracing"
+	bool	"VServer History Tracing"
 	depends on VSERVER_DEBUG
 	default n
 	help