From 163c21ff1f3b5287f6698de9db1d9870b4e2e241 Mon Sep 17 00:00:00 2001
From: Maximilian Attems <maks@debian.org>
Date: Tue, 16 Mar 2010 00:11:09 +0000
Subject: [PATCH] readd openvz in small dose

still disabled and without patch,
but makes it easier for me to test against latest sid.

svn path=/dists/sid/linux-2.6/; revision=15384
---
 debian/bin/test-patches                 |  2 +-
 debian/config/amd64/defines             |  1 +
 debian/config/defines                   |  4 ++++
 debian/config/featureset-openvz/config  | 25 +++++++++++++++++++++++++
 debian/config/featureset-openvz/defines |  7 +++++++
 debian/config/i386/defines              |  1 +
 6 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 debian/config/featureset-openvz/config
 create mode 100644 debian/config/featureset-openvz/defines

diff --git a/debian/bin/test-patches b/debian/bin/test-patches
index 6cf9bfcb3..fdcff209f 100755
--- a/debian/bin/test-patches
+++ b/debian/bin/test-patches
@@ -8,7 +8,7 @@ arch="$(dpkg --print-architecture)"
 kernelabi="$(uname -r)"
 ff="${kernelabi#+([^-])-@(trunk|+([0-9]))-}"
 if [ "x$ff" != "x$kernelabi" ]; then
-    flavour="${ff#@(vserver|xen)-}"
+    flavour="${ff#@(openvz|vserver|xen)-}"
     if [ "x$flavour" != "x$ff" ]; then
 	featureset="${ff%-$flavour}"
     else
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index dbd2e80a0..71edc6e1c 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -1,5 +1,6 @@
 [base]
 featuresets:
+ openvz
  vserver
  xen
 flavours:
diff --git a/debian/config/defines b/debian/config/defines
index f5dd6303c..e675d2e7b 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -19,9 +19,13 @@ arches:
 compiler: gcc-4.3
 featuresets:
  none
+ openvz
  vserver
  xen
 
+[featureset-openvz_base]
+enabled: false
+
 [featureset-vserver_base]
 enabled: true
 
diff --git a/debian/config/featureset-openvz/config b/debian/config/featureset-openvz/config
new file mode 100644
index 000000000..68b7d3235
--- /dev/null
+++ b/debian/config/featureset-openvz/config
@@ -0,0 +1,25 @@
+CONFIG_VZ_FAIRSCHED=y
+CONFIG_VE=y
+CONFIG_VE_CALLS=m
+CONFIG_VE_NETDEV=m
+CONFIG_VE_ETHDEV=m
+CONFIG_VZ_DEV=m
+CONFIG_VE_IPTABLES=y
+CONFIG_VZ_WDOG=m
+CONFIG_VZ_CHECKPOINT=m
+CONFIG_SIM_FS=m
+CONFIG_VZ_QUOTA=m
+# CONFIG_VZ_QUOTA_UNLOAD is not set
+CONFIG_VZ_QUOTA_UGID=y
+CONFIG_SYSRQ_DEBUG=y
+CONFIG_BEANCOUNTERS=y
+CONFIG_BC_RSS_ACCOUNTING=y
+CONFIG_BC_IO_ACCOUNTING=y
+CONFIG_BC_IO_SCHED=y
+CONFIG_BC_SWAP_ACCOUNTING=y
+CONFIG_BC_PROC=y
+# CONFIG_BC_DEBUG is not set
+
+# buggy
+# CONFIG_NF_CONNTRACK_IPV6 is not set
+
diff --git a/debian/config/featureset-openvz/defines b/debian/config/featureset-openvz/defines
new file mode 100644
index 000000000..061c4f0c8
--- /dev/null
+++ b/debian/config/featureset-openvz/defines
@@ -0,0 +1,7 @@
+[description]
+part-long-openvz: This kernel includes support for OpenVZ container-based virtualization.
+part-short-openvz: OpenVZ support
+parts: openvz
+
+[image]
+depends: vzctl
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 461ec998f..367df2eaf 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -1,5 +1,6 @@
 [base]
 featuresets:
+ openvz
  vserver
  xen
 flavours: