Moved the unsharing of netns into util-vserver-pl

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index dd0e51d..db232fc 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -158,7 +158,6 @@ Patch590: linux-2.6-590-chopstix-intern.patch
 
 # VINI
 Patch700: linux-2.6-700-trellis-mm1-netns.patch
 
 # VINI
 Patch700: linux-2.6-700-trellis-mm1-netns.patch

-Patch710: linux-2.6-710-unshare-netns.patch

 Patch720: linux-2.6-720-ztun-sb.patch
 Patch730: linux-2.6-730-egre.patch
 Patch740: linux-2.6-740-new_ns_pid.patch
 Patch720: linux-2.6-720-ztun-sb.patch
 Patch730: linux-2.6-730-egre.patch
 Patch740: linux-2.6-740-new_ns_pid.patch


@@ -344,7 +343,6 @@ KERNEL_PREVIOUS=vanilla
 # 
 %if 0%{?_with_netns}
 %ApplyPatch 700
 # 
 %if 0%{?_with_netns}
 %ApplyPatch 700

-%ApplyPatch 710

 %ApplyPatch 720
 %ApplyPatch 730
 %ApplyPatch 740
 %ApplyPatch 720
 %ApplyPatch 730
 %ApplyPatch 740

diff --git a/linux-2.6-710-unshare-netns.patch b/linux-2.6-710-unshare-netns.patch
deleted file mode 100644 (file)
index bf68a7d..0000000
--- a/linux-2.6-710-unshare-netns.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nurb linux-2.6.22-590/kernel/vserver/space.c linux-2.6.22-591/kernel/vserver/space.c
---- linux-2.6.22-590/kernel/vserver/space.c    2008-01-02 13:56:26.000000000 -0500
-+++ linux-2.6.22-591/kernel/vserver/space.c    2008-01-18 12:10:39.000000000 -0500
-@@ -37,7 +37,8 @@
-       .mask = CLONE_NEWNS |
-               CLONE_NEWUTS |
-               CLONE_NEWIPC |
--              CLONE_FS
-+              CLONE_FS | 
-+              CLONE_NEWNET
- };
- 
-