From 3c65d2f1c4b718f3754db081dd1d25853b371689 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@geeks.cl>
Date: Sun, 10 May 2009 06:49:27 -0400
Subject: [PATCH] vserver: disable experimental vserver eatures in the kernel
 (for now)

---
 security/vserver/linux.cfg           | 4 ++++
 security/vserver/pkg_linux_post.conf | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 security/vserver/linux.cfg

diff --git a/security/vserver/linux.cfg b/security/vserver/linux.cfg
new file mode 100644
index 000000000..6f69e050a
--- /dev/null
+++ b/security/vserver/linux.cfg
@@ -0,0 +1,4 @@
+CONFIG_VSERVER_VTIME=n
+CONFIG_VSERVER_DEVICE=n
+CONFIG_TAG_NFSD=n
+CONFIG_VSERVER_PRIVACY=n
diff --git a/security/vserver/pkg_linux_post.conf b/security/vserver/pkg_linux_post.conf
index d052b3b07..02820ff23 100644
--- a/security/vserver/pkg_linux_post.conf
+++ b/security/vserver/pkg_linux_post.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../vserver/pkg_linux_post.conf
-# Copyright (C) 2006 - 2008 The OpenSDE Project
+# Copyright (C) 2006 - 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -74,3 +74,5 @@ fi
 
 echo_status "Including VServer ($pkg_ctx_ver) support."
 hook_add postpatch 5 "lx_extraversion=\$lx_extraversion-vs${pkg_ctx_ver}"
+
+var_insert lx_confmerge ' ' "$pkg_ctx_confdir/linux.cfg"