- restore disabling USER_NS for vserver

- rel 2

diff --git a/kernel-vserver-fixes.patch b/kernel-vserver-fixes.patch
index b46a5614512d0d5e0ea1bafe7071f439edbecf85..d0dafc24c9fe2646ff23079b90bbb0fc4aaab5eb 100644 (file)
--- a/kernel-vserver-fixes.patch
+++ b/kernel-vserver-fixes.patch
@@ -9,3 +9,14 @@
        if (pid->hide_pid < hide_pid_min)
                return true;
        if (in_group_p(pid->pid_gid))
+diff -NurpP --minimal linux-3.14.17/init/Kconfig linux-3.14.17-vs2.3.6.13/init/Kconfig
+--- linux-3.14.17/init/Kconfig 2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/init/Kconfig      2014-08-30 14:37:19.000000000 +0000
+@@ -1117,6 +1118,7 @@ config IPC_NS
+ 
+ config USER_NS
+       bool "User namespace"
++      depends on VSERVER_DISABLED
+       default n
+       help
+         This allows containers, i.e. vservers, to use user namespaces

diff --git a/kernel.spec b/kernel.spec
index 64b83747346efa5a2a43e612498d7409875652fc..19d6908fa709c0b055de446b16e969f1f5c841de 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,7 +68,7 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             1
+%define                rel             2
 %define                basever         3.14
 %define                postver         .18